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

feature: Add mysql failed query logging + fixed queries that break ONLY_FULL_GROUP_BY (#5327)

Browse Source 
* feature: Add mysql failed query logging + fixed queries that break ONLY_FULL_GROUP_BY

* fix all schema errors and update system
This commit is contained in:
Neil Lathwood
2017-01-07 17:32:38 +00:00
committed by Tony Murray
parent 8936d9503b
commit da5783d917
33 changed files with 67 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
includes/sql-schema/update.php
View File

@@ -36,34 +36,6 @@ if ($db_rev = @dbFetchCell('SELECT version FROM `dbSchema` ORDER BY version DESC
$insert = 1;
}
// For transition from old system
if ($old_rev = @dbFetchCell('SELECT revision FROM `dbSchema`')) {
echo "-- Transitioning from old revision-based schema to database version system\n";
$db_rev = 6;
if ($old_rev <= 1000) {
$db_rev = 1;
}
if ($old_rev <= 1435) {
$db_rev = 2;
}
if ($old_rev <= 2245) {
$db_rev = 3;
}
if ($old_rev <= 2804) {
$db_rev = 4;
}
if ($old_rev <= 2827) {
$db_rev = 5;
}
$insert = 1;
}//end if
$updating = 0;
$include_dir_regexp = '/\.sql$/';
@@ -130,11 +102,7 @@ foreach ($filelist as $file) {
}
}
if ($db_rev < 5) {
echo " done.\n";
} else {
echo " done ($err errors).\n";
}
echo " done ($err errors).\n";
} else {
echo " Could not open file!\n";
}//end if
@@ -143,9 +111,7 @@ foreach ($filelist as $file) {
$db_rev = $filename;
if ($insert) {
dbInsert(array('version' => $db_rev), 'dbSchema');
if ($db_rev >= 6) {
$insert = 0;
}
$insert = 0;
} else {
dbUpdate(array('version' => $db_rev), 'dbSchema');
}