clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check 'config' table as fallback for migrations

This commit is contained in:
Philipp 2023-01-05 21:42:35 +01:00
parent 7fcb6c86f1
commit b4096251ba
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Core/Update.php
View File

@ -61,8 +61,18 @@ class Update
$build = DI::config()->get('system', 'build'); $build = DI::config()->get('system', 'build');
if (empty($build)) { if (empty($build)) {
DI::config()->set('system', 'build', DB_UPDATE_VERSION - 1); // legacy option - check if there's something in the Config table
$build = DB_UPDATE_VERSION - 1; if (DBStructure::existsTable('config')) {
$dbConfig = DBA::selectFirst('config', ['v'], ['cat' => 'system', 'k' => 'build']);
if (!empty($dbConfig)) {
$build = $dbConfig['v'];
}
}
if (empty($build)) {
DI::config()->set('system', 'build', DB_UPDATE_VERSION - 1);
$build = DB_UPDATE_VERSION - 1;
}
} }
// We don't support upgrading from very old versions anymore // We don't support upgrading from very old versions anymore
@ -119,11 +129,21 @@ class Update
DI::lock()->release('dbupdate', true); DI::lock()->release('dbupdate', true);
} }
$build = DI::config()->get('system', 'build', null); $build = DI::config()->get('system', 'build');
if (empty($build) || ($build > DB_UPDATE_VERSION)) { if (empty($build)) {
$build = DB_UPDATE_VERSION - 1; // legacy option - check if there's something in the Config table
DI::config()->set('system', 'build', $build); if (DBStructure::existsTable('config')) {
$dbConfig = DBA::selectFirst('config', ['v'], ['cat' => 'system', 'k' => 'build']);
if (!empty($dbConfig)) {
$build = $dbConfig['v'];
}
}
if (empty($build) || ($build > DB_UPDATE_VERSION)) {
DI::config()->set('system', 'build', DB_UPDATE_VERSION - 1);
$build = DB_UPDATE_VERSION - 1;
}
} }
if ($build != DB_UPDATE_VERSION || $force) { if ($build != DB_UPDATE_VERSION || $force) {
@ -141,7 +161,15 @@ class Update
Logger::notice('Update starting.', ['from' => $stored, 'to' => $current]); Logger::notice('Update starting.', ['from' => $stored, 'to' => $current]);
// Checks if the build changed during Lock acquiring (so no double update occurs) // Checks if the build changed during Lock acquiring (so no double update occurs)
$retryBuild = DI::config()->get('system', 'build', null); $retryBuild = DI::config()->get('system', 'build');
// legacy option - check if there's something in the Config table
if (DBStructure::existsTable('config')) {
$dbConfig = DBA::selectFirst('config', ['v'], ['cat' => 'system', 'k' => 'build']);
if (!empty($dbConfig)) {
$retryBuild = $dbConfig['v'];
}
}
if ($retryBuild !== $build) { if ($retryBuild !== $build) {
Logger::notice('Update already done.', ['from' => $stored, 'to' => $current]); Logger::notice('Update already done.', ['from' => $stored, 'to' => $current]);
DI::lock()->release('dbupdate'); DI::lock()->release('dbupdate');