Replace PostUpdate key-value config entries with key-value pair entries

[friendica.git] / src / Database / DBStructure.php

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 441116d167f9277ce681531002d119ded2f485b5..83e238394ec20b1a59d18936b6a1b900bb42292c 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -53,7 +53,7 @@ class DBStructure
                        throw new \Asika\SimpleConsole\CommandArgsException('The version number must be numeric');
                }
 
-               DI::config()->set('system', 'build', $version);
+               DI::keyValue()->set( 'build',  $version);
                echo DI::l10n()->t('The database version had been set to %s.', $version);
        }
 
@@ -65,7 +65,7 @@ class DBStructure
         */
        public static function dropTables(bool $execute)
        {
-               $postupdate = DI::config()->get('system', 'post_update_version', PostUpdate::VERSION);
+               $postupdate = DI::keyValue()->get('post_update_version') ?? PostUpdate::VERSION;
                if ($postupdate < PostUpdate::VERSION) {
                        echo DI::l10n()->t('The post update is at version %d, it has to be at %d to safely drop the tables.', $postupdate, PostUpdate::VERSION);
                        return;
@@ -74,7 +74,7 @@ class DBStructure
                $old_tables = ['fserver', 'gcign', 'gcontact', 'gcontact-relation', 'gfollower' ,'glink', 'item-delivery-data',
                        'item-activity', 'item-content', 'item_id', 'participation', 'poll', 'poll_result', 'queue', 'retriever_rule',
                        'deliverq', 'dsprphotoq', 'ffinder', 'sign', 'spam', 'term', 'user-item', 'thread', 'item', 'challenge',
-                       'auth_codes', 'tokens', 'clients', 'profile_check', 'host'];
+                       'auth_codes', 'tokens', 'clients', 'profile_check', 'host', 'conversation', 'fcontact'];
 
                $tables = DBA::selectToArray('INFORMATION_SCHEMA.TABLES', ['TABLE_NAME'],
                        ['TABLE_SCHEMA' => DBA::databaseName(), 'TABLE_TYPE' => 'BASE TABLE']);
@@ -150,7 +150,7 @@ class DBStructure
                echo DI::l10n()->t("\nError %d occurred during database update:\n%s\n",
                        DBA::errorNo(), DBA::errorMessage());
 
-               return DI::l10n()->t('Errors encountered performing database changes: ') . $message . EOL;
+               return DI::l10n()->t('Errors encountered performing database changes: ') . $message . '<br />';
        }
 
        /**
@@ -176,14 +176,14 @@ class DBStructure
        public static function performUpdate(bool $enable_maintenance_mode = true, bool $verbose = false): string
        {
                if ($enable_maintenance_mode) {
-                       DI::config()->set('system', 'maintenance', 1);
+                       DI::keyValue()->set( 'maintenance',  1);
                }
 
                $status = self::update($verbose, true);
 
                if ($enable_maintenance_mode) {
-                       DI::config()->set('system', 'maintenance', 0);
-                       DI::config()->set('system', 'maintenance_reason', '');
+                       DI::keyValue()->set( 'maintenance',  0);
+                       DI::keyValue()->set( 'maintenance_reason',  '');
                }
 
                return $status;
@@ -213,7 +213,7 @@ class DBStructure
         */
        private static function update(bool $verbose, bool $action, bool $install = false, array $tables = null, array $definition = null): string
        {
-               $in_maintenance_mode = DI::config()->get('system', 'maintenance');
+               $in_maintenance_mode = DI::keyValue()->get('system',  'maintenance');
 
                if ($action && !$install && self::isUpdating()) {
                        return DI::l10n()->t('Another database update is currently running.');
@@ -249,7 +249,8 @@ class DBStructure
 
                // Get the definition
                if (is_null($definition)) {
-                       $definition = DI::dbaDefinition()->getAll();
+                       // just for Update purpose, reload the DBA definition with addons to explicit get the whole definition
+                       $definition = DI::dbaDefinition()->load(true)->getAll();
                }
 
                // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
@@ -493,9 +494,9 @@ class DBStructure
 
                if ($action && !$install) {
                        if ($errors) {
-                               DI::config()->set('system', 'dbupdate', self::UPDATE_FAILED);
+                               DI::config()->set('system',  'dbupdate',  self::UPDATE_FAILED);
                        } else {
-                               DI::config()->set('system', 'dbupdate', self::UPDATE_SUCCESSFUL);
+                               DI::config()->set( 'system', 'dbupdate',  self::UPDATE_SUCCESSFUL);
                        }
                }