Merge pull request #9397 from vinzv/9238-red-color-unread-messages-faded

[friendica.git] / src / Console / DatabaseStructure.php

diff --git a/src/Console/DatabaseStructure.php b/src/Console/DatabaseStructure.php
index ca210064527af673f700cac9467dbd4396dfc108..a1b4fdbfe8150b28a4d759e2e296ea33df2de822 100644 (file)
--- a/src/Console/DatabaseStructure.php
+++ b/src/Console/DatabaseStructure.php
@@ -1,17 +1,34 @@
 <?php
 <?php

+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */

 
 namespace Friendica\Console;
 
 
 namespace Friendica\Console;
 

-use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Cache;

 use Friendica\Core\Update;
 use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
 use RuntimeException;
 
 /**
 use Friendica\Core\Update;
 use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
 use RuntimeException;
 
 /**

- * @brief Performs database updates from the command line
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ * Performs database updates from the command line

  */
 class DatabaseStructure extends \Asika\SimpleConsole\Console
 {
  */
 class DatabaseStructure extends \Asika\SimpleConsole\Console
 {


@@ -22,7 +39,7 @@ class DatabaseStructure extends \Asika\SimpleConsole\Console
         */
        private $dba;
        /**
         */
        private $dba;
        /**

-        * @var ConfigCache
+        * @var Cache

         */
        private $configCache;
 
         */
        private $configCache;
 


@@ -37,7 +54,8 @@ Commands
        dryrun   Show database update schema queries without running them
        update   Update database schema
        dumpsql  Dump database schema
        dryrun   Show database update schema queries without running them
        update   Update database schema
        dumpsql  Dump database schema

-       toinnodb Convert all tables from MyISAM to InnoDB
+       toinnodb Convert all tables from MyISAM or InnoDB in the Antelope file format to InnoDB in the Barracuda file format
+       version  Set the database to a given number

 
 Options
     -h|--help|-?       Show help information
 
 Options
     -h|--help|-?       Show help information


@@ -48,7 +66,7 @@ HELP;
                return $help;
        }
 
                return $help;
        }
 

-       public function __construct(Database $dba, ConfigCache $configCache, $argv = null)
+       public function __construct(Database $dba, Cache $configCache, $argv = null)

        {
                parent::__construct($argv);
 
        {
                parent::__construct($argv);
 


@@ -69,8 +87,10 @@ HELP;
                        return 0;
                }
 
                        return 0;
                }
 

-               if (count($this->args) > 1) {
+               if ((count($this->args) > 1) && ($this->getArgument(0) != 'version')) {

                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');

+               } elseif ((count($this->args) != 2) && ($this->getArgument(0) == 'version')) {
+                       throw new \Asika\SimpleConsole\CommandArgsException('This command needs two arguments');

                }
 
                if (!$this->dba->isConnected()) {
                }
 
                if (!$this->dba->isConnected()) {


@@ -98,6 +118,12 @@ HELP;
                                DBStructure::convertToInnoDB();
                                $output = ob_get_clean();
                                break;
                                DBStructure::convertToInnoDB();
                                $output = ob_get_clean();
                                break;

+                       case "version":
+                               ob_start();
+                               DBStructure::setDatabaseVersion($this->getArgument(1));
+                               $output = ob_get_clean();
+                               break;
+                                       

                        default:
                                $output = 'Unknown command: ' . $this->getArgument(0);
                }
                        default:
                                $output = 'Unknown command: ' . $this->getArgument(0);
                }