manually check and create the Config table before running the update

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 0f0484b4e7efb1764d03a54c5d81f46cdcfc9c0a..a4c5cf313e7de99d3e54fb9c457f42c32236f1a0 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -129,22 +129,30 @@ class Update
                        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 the Config table exists
-                       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)) {
-                               // 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;
                        }
                }