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

Install: Validate database before migrating (#12867)

Browse Source 
* Validate database during install
Needed to remove usages of legacy functions in the validation

* Fix output, restore real versions
This commit is contained in:
Tony Murray
2021-05-13 07:18:54 -05:00
committed by GitHub
parent 500b0ac6fa
commit df5096e449
15 changed files with 77 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ if (config('cache.default') == 'database' && ! \Schema::hasTable('cache_locks'))
$schemaLock = Cache::lock('schema', 86000);
if (! empty($skip_schema_lock) || $schemaLock->get()) {
$db_rev = get_db_schema();
$db_rev = \LibreNMS\DB\Schema::getLegacySchema();
$migrate_opts = ['--force' => true, '--ansi' => true];
@@ -93,7 +93,7 @@ if (! empty($skip_schema_lock) || $schemaLock->get()) {
echo "-- Done\n";
// end legacy update
$db_rev = get_db_schema();
$db_rev = \LibreNMS\DB\Schema::getLegacySchema();
}
if ($db_rev == 1000) {