mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix database validation for MySQL 8 (#9923)

Browse Source
This commit is contained in:
David
2019-03-09 21:15:03 +01:00
committed by Tony Murray
parent 6eda5eea91
commit 569b1f0fb2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LibreNMS/Validations/Database.php
View File

@@ -184,6 +184,12 @@ class Database extends BaseValidation
foreach ($data['Columns'] as $index => $cdata) {
$column = $cdata['Field'];
// MySQL 8 fix, remove DEFAULT_GENERATED from timestamp extra columns
if ($cdata['Type'] == 'timestamp') {
$current_columns[$column]['Extra'] = preg_replace("/DEFAULT_GENERATED[ ]*/", '', $current_columns[$column]['Extra']);
}
if (empty($current_columns[$column])) {
$validator->fail("Database: missing column ($table/$column)");
$primary = false;