Remove search table engine check from SystemCheckPage

As of c36b70769fd366597d463064b29afc87fb2bcefe both engines are supported just
fine.

This is related to #3404.

diff --git a/wcfsetup/install/files/acp/templates/systemCheck.tpl b/wcfsetup/install/files/acp/templates/systemCheck.tpl
index 4a61d864249ef9c386eb13f50a2408fa8bcc84bb..7555ef466db066cf65c17565d63dd2861970e68d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/systemCheck.tpl
+++ b/wcfsetup/install/files/acp/templates/systemCheck.tpl
@@ -160,18 +160,6 @@
                        <small>{lang}wcf.acp.systemCheck.mysql.foreignKeys.description{/lang}</small>
                </dd>
        </dl>
-       
-       <dl{if !$results[mysql][searchEngine][result]} class="formError"{/if}>
-               <dt>{lang}wcf.acp.systemCheck.mysql.searchEngine{/lang}</dt>
-               <dd>
-                       {if $results[mysql][searchEngine][result]}
-                               {@$statusOk} {lang}wcf.acp.systemCheck.pass{/lang}
-                       {else}
-                               {@$statusInsufficient} {lang}wcf.acp.systemCheck.mysql.searchEngine.incorrect{/lang}
-                       {/if}
-                       <small>{lang}wcf.acp.systemCheck.mysql.searchEngine.description{/lang}</small>
-               </dd>
-       </dl>
 </section>
 
 <section class="section">

diff --git a/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php b/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
index 45601145bd578f569149f9b3ad8814a06f44e157..b34111b34e7290d5901e8454dbc020a4a10f2cae 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
@@ -1,11 +1,9 @@
 <?php
 namespace wcf\acp\page;
 use wcf\data\application\Application;
-use wcf\data\object\type\ObjectTypeCache;
 use wcf\page\AbstractPage;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
-use wcf\system\search\SearchIndexManager;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
 
@@ -124,10 +122,6 @@ class SystemCheckPage extends AbstractPage {
                        'result' => false,
                        'version' => '0.0.0',
                        'foreignKeys' => false,
-                       'searchEngine' => [
-                               'result' => false, 
-                               'incorrectTables' => [],
-                       ],
                ],
                'php' => [
                        'gd' => [
@@ -257,31 +251,7 @@ class SystemCheckPage extends AbstractPage {
                
                $this->results['mysql']['foreignKeys'] = $statement->fetchSingleColumn() == $expectedForeignKeyCount;
                
-               // check search engine tables
-               $objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.searchableObjectType');
-               $tableNames = [];
-               foreach ($objectTypes as $objectType) {
-                       $tableNames[] = SearchIndexManager::getTableName($objectType->objectType);
-               }
-               $conditionBuilder = new PreparedStatementConditionBuilder(true);
-               $conditionBuilder->add('TABLE_NAME IN (?)', [$tableNames]);
-               $conditionBuilder->add('TABLE_SCHEMA = ?', [WCF::getDB()->getDatabaseName()]);
-               
-               $sql = "SELECT          TABLE_NAME, ENGINE
-                       FROM            INFORMATION_SCHEMA.TABLES
-                       ". $conditionBuilder;
-               $statement = WCF::getDB()->prepareStatement($sql);
-               $statement->execute($conditionBuilder->getParameters());
-               
-               while ($row = $statement->fetchArray()) {
-                       if ($row['ENGINE'] !== 'MyISAM') {
-                               $this->results['mysql']['searchEngine']['incorrectTables'][$row['TABLE_NAME']] = $row['ENGINE'];
-                       }
-               }
-               
-               $this->results['mysql']['searchEngine']['result'] = empty($this->results['mysql']['searchEngine']['incorrectTables']);
-               
-               if ($this->results['mysql']['result'] && $this->results['mysql']['innodb'] && $this->results['mysql']['foreignKeys'] && $this->results['mysql']['searchEngine']['result']) {
+               if ($this->results['mysql']['result'] && $this->results['mysql']['innodb'] && $this->results['mysql']['foreignKeys']) {
                        $this->results['status']['mysql'] = true;
                }
        }

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 21aefbcb4042dc5f44419fd35761a34b2ba45b66..86b7a5b9c7eac4515c8d3d666b44c039702c153c 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2749,9 +2749,6 @@ Kein Abschnitt darf leer sein und alle Abschnitten dürfen nur folgende Zeichen
                <item name="wcf.acp.systemCheck.mysql.version.description"><![CDATA[Es wird mindestens MySQL {$mysqlVersions[mysql][5]} oder MySQL {$mysqlVersions[mysql][8]} bzw. MariaDB {$mysqlVersions[mariadb][10]} benötigt, grundsätzlich wird der Einsatz neuerer Version ausdrücklich empfohlen.]]></item>
                <item name="wcf.acp.systemCheck.mysql.foreignKeys"><![CDATA[Fremdschlüssel]]></item>
                <item name="wcf.acp.systemCheck.mysql.foreignKeys.description"><![CDATA[Fremdschlüssel werden mit der Installation in der Datenbank angelegt und werden für einen einwandfreien Betrieb benötigt.]]></item>
-               <item name="wcf.acp.systemCheck.mysql.searchEngine"><![CDATA[Suche]]></item>
-               <item name="wcf.acp.systemCheck.mysql.searchEngine.description"><![CDATA[Alle Tabellen, die für die Suche genutzt werden, müssen mit der Storage-Engine MyISAM betrieben werden.]]></item>
-               <item name="wcf.acp.systemCheck.mysql.searchEngine.incorrect"><![CDATA[Die folgenden Tabellen verwenden eine inkorrekte Storage-Engine (erwartete Storage-Engine: <code>MyISAM</code>): {implode from=$results[mysql][searchEngine][incorrectTables] key=tableName item=engine glue=", "}<code>{$tableName}</code> (<code>{$engine}</code>){/implode}.]]></item>
                <item name="wcf.acp.systemCheck.php.extension"><![CDATA[Erweiterungen]]></item>
                <item name="wcf.acp.systemCheck.php.extension.description"><![CDATA[Die offiziellen Erweiterungen von PHP stellen zusätzliche Funktionen bereit, die für den Betrieb der Software notwendig sind.]]></item>
                <item name="wcf.acp.systemCheck.php.memoryLimit"><![CDATA[Verfügbarer Arbeitsspeicher („memory_limit“)]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index b69e63189d9cad125117de0c3a7b5d561cd8c84e..ff01b51105de78870845572ccfc2a77d4b580af2 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2677,9 +2677,6 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
                <item name="wcf.acp.systemCheck.mysql.version.description"><![CDATA[MySQL {$mysqlVersions[mysql][5]} or MySQL {$mysqlVersions[mysql][8]} or MariaDB {$mysqlVersions[mariadb][10]} are required at minimum, but it’s strongly recommended to always use the latest available version.]]></item>
                <item name="wcf.acp.systemCheck.mysql.foreignKeys"><![CDATA[Foreign Keys]]></item>
                <item name="wcf.acp.systemCheck.mysql.foreignKeys.description"><![CDATA[Foreign Keys are created with the installation and are required for the software to work.]]></item>
-               <item name="wcf.acp.systemCheck.mysql.searchEngine"><![CDATA[Search]]></item>
-               <item name="wcf.acp.systemCheck.mysql.searchEngine.description"><![CDATA[All tables used for the search must be configured with the MyISAM storage engine.]]></item>
-               <item name="wcf.acp.systemCheck.mysql.searchEngine.incorrect"><![CDATA[The following tables using an incorrect storage engine (expected storage engine <code>MyISAM</code>): {implode from=$results[mysql][searchEngine][incorrectTables] key=tableName item=engine glue=", "}<code>{$tableName}</code> (<code>{$engine}</code>){/implode}.]]></item>
                <item name="wcf.acp.systemCheck.php.extension"><![CDATA[Extensions]]></item>
                <item name="wcf.acp.systemCheck.php.extension.description"><![CDATA[The official PHP extensions provide additional capabilities and features that are required for the software to work.]]></item>
                <item name="wcf.acp.systemCheck.php.memoryLimit"><![CDATA[Available Memory (“memory_limit”)]]></item>