Hashtag handling with Diaspora improved

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

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 18832b8e505c6416e3c5737decb1f03aa02bd90f..6fe4d614d8caea008cb60b25095d358960e43134 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -1,12 +1,27 @@
 <?php
 /**
- * @file src/Database/DBStructure.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\Database;
 
 use Exception;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
@@ -34,7 +49,7 @@ class DBStructure
        private static $definition = [];
 
        /**
-        * Converts all tables from MyISAM to InnoDB
+        * Converts all tables from MyISAM/InnoDB Antelope to InnoDB Barracuda
         */
        public static function convertToInnoDB()
        {
@@ -44,13 +59,19 @@ class DBStructure
                        ['engine' => 'MyISAM', 'table_schema' => DBA::databaseName()]
                );
 
+               $tables = array_merge($tables, DBA::selectToArray(
+                       ['information_schema' => 'tables'],
+                       ['table_name'],
+                       ['engine' => 'InnoDB', 'ROW_FORMAT' => ['COMPACT', 'REDUNDANT'], 'table_schema' => DBA::databaseName()]
+               ));
+
                if (!DBA::isResult($tables)) {
-                       echo DI::l10n()->t('There are no tables on MyISAM.') . "\n";
+                       echo DI::l10n()->t('There are no tables on MyISAM or InnoDB with the Antelope file format.') . "\n";
                        return;
                }
 
                foreach ($tables AS $table) {
-                       $sql = "ALTER TABLE " . DBA::quoteIdentifier($table['table_name']) . " engine=InnoDB;";
+                       $sql = "ALTER TABLE " . DBA::quoteIdentifier($table['table_name']) . " ENGINE=InnoDB ROW_FORMAT=DYNAMIC;";
                        echo $sql . "\n";
 
                        $result = DBA::e($sql);