Adapt & remove impossible code

diff --git a/src/Core/Update.php b/src/Core/Update.php
index a4c5cf313e7de99d3e54fb9c457f42c32236f1a0..2718d03d0c3318d69e33e0fd84b28e2ac325cf09 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -129,20 +129,6 @@ 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)) {

diff --git a/src/Core/Worker/Cron.php b/src/Core/Worker/Cron.php
index d0b915f87aa36c70be2d5b5efb1938b9faf6beb2..dcb9fd3ab443493db37942809adce0d211be43fd 100644 (file)
--- a/src/Core/Worker/Cron.php
+++ b/src/Core/Worker/Cron.php
@@ -197,7 +197,7 @@ class Cron
                // Optimizing this table only last seconds
                if (DI::config()->get('system', 'optimize_tables')) {
                        Logger::info('Optimize start');
-                       DBA::e("OPTIMIZE TABLE `post-delivery`");
+                       DBA::optimizeTable('post-delivery');
                        Logger::info('Optimize end');
                }
        }

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index dc1e785a50071dac4875bbcc3967ea0d76b60f3e..3141ca666bab86c7c379919d8519f352701a5e5d 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -57,6 +57,18 @@ class DBStructure
                echo DI::l10n()->t('The database version had been set to %s.', $version);
        }
 
+       /**
+        * Dops a specific table
+        *
+        * @param string $table the table name
+        *
+        * @return bool true if possible, otherwise false
+        */
+       public static function dropTable(string $table): bool
+       {
+               return DBA::isResult(DBA::e('DROP TABLE ' . DBA::quoteIdentifier($table) . ';'));
+       }
+
        /**
         * Drop unused tables
         *
@@ -94,8 +106,7 @@ class DBStructure
                                        $sql = 'DROP TABLE ' . DBA::quoteIdentifier($table) . ';';
                                        echo $sql . "\n";
 
-                                       $result = DBA::e($sql);
-                                       if (!DBA::isResult($result)) {
+                                       if (!static::dropTable($table)) {
                                                self::printUpdateError($sql);
                                        }
                                } else {