keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

manually check and create the Config table before running the update

Browse source
This commit is contained in:
Philipp 2023-02-12 16:44:56 +01:00
parent aeb3c7e96c
commit 4dc164a5a1
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Core/Update.php
View file

@ -129,22 +129,30 @@ class Update
DI::lock()->release('dbupdate', true); DI::lock()->release('dbupdate', true);
} }
if (!DBStructure::existsTable('config')) {
DBA::e(<<<EOF
CREATE TABLE IF NOT EXISTS `config` (
`id` int unsigned NOT NULL auto_increment COMMENT '',
`cat` varbinary(50) NOT NULL DEFAULT '' COMMENT 'The category of the entry',
`k` varbinary(50) NOT NULL DEFAULT '' COMMENT 'The key of the entry',
`v` mediumtext COMMENT '',
PRIMARY KEY(`id`),
UNIQUE INDEX `cat_k` (`cat`,`k`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='main configuration storage';
EOF
);
}
$build = DI::config()->get('system', 'build'); $build = DI::config()->get('system', 'build');
if (empty($build)) { if (empty($build)) {
// legacy option - check if the Config table exists
if (DBStructure::existsTable('config')) {
$dbConfig = DBA::selectFirst('config', ['v'], ['cat' => 'system', 'k' => 'build']); $dbConfig = DBA::selectFirst('config', ['v'], ['cat' => 'system', 'k' => 'build']);
if (!empty($dbConfig)) { if (!empty($dbConfig)) {
$build = $dbConfig['v']; $build = $dbConfig['v'];
} }
}
if (empty($build) || ($build > DB_UPDATE_VERSION)) { if (empty($build) || ($build > DB_UPDATE_VERSION)) {
// legacy option - check if the Config table exists
if (DBStructure::existsTable('config')) {
DI::config()->set('system', 'build', DB_UPDATE_VERSION - 1); DI::config()->set('system', 'build', DB_UPDATE_VERSION - 1);
}
$build = DB_UPDATE_VERSION - 1; $build = DB_UPDATE_VERSION - 1;
} }
} }