* @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function check(string $basePath, bool $via_worker, App\Mode $mode)
+ public static function check(string $basePath, bool $via_worker)
{
if (!DBA::connected()) {
return;
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');
if (empty($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)) {
- $build = $dbConfig['v'];
- }
+ $dbConfig = DBA::selectFirst('config', ['v'], ['cat' => 'system', 'k' => 'build']);
+ if (!empty($dbConfig)) {
+ $build = $dbConfig['v'];
}
if (empty($build) || ($build > DB_UPDATE_VERSION)) {
// Checks if the build changed during Lock acquiring (so no double update occurs)
$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) {
+ // 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 = intval($dbConfig['v']);
+ }
}
- }
- if ($retryBuild !== $build) {
- Logger::notice('Update already done.', ['from' => $stored, 'to' => $current]);
- DI::lock()->release('dbupdate');
- return '';
+ if ($retryBuild != $build) {
+ Logger::notice('Update already done.', ['from' => $build, 'retry' => $retryBuild, 'to' => $current]);
+ DI::lock()->release('dbupdate');
+ return '';
+ }
}
DI::config()->set('system', 'maintenance', 1);