Changeset 47193

Timestamp:

02/05/2020 06:19:11 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: In Tests_dbDelta::setUp(), only force MyISAM database engine on MySQL versions older than 5.7.

Since MySQL 5.7, InnoDB engine supports FULLTEXT indexes, so forcing MyISAM is unnecessary.

Props xkon, joonasvanhatapio, SergeyBiryukov.
Fixes #49367.

File:

• trunk/tests/phpunit/tests/dbdelta.php (modified) (3 diffs)

trunk/tests/phpunit/tests/dbdelta.php

@@ -41 +41 @@
 
         $db_version = $wpdb->db_version();
+        $db_engine  = '';
+
+        if ( version_compare( $db_version, '5.7', '<' ) ) {
+            // Forcing MyISAM, because InnoDB only started supporting FULLTEXT indexes in MySQL 5.7.
+            $db_engine = 'ENGINE=MyISAM';
+        }
 
         if ( version_compare( $db_version, '8.0.17', '<' ) ) {
@@ -47 +53 @@
         }
 
-        // Forcing MyISAM, because InnoDB only started supporting FULLTEXT indexes in MySQL 5.7.
         $wpdb->query(
             $wpdb->prepare(
@@ -60 +65 @@
                     KEY key_1 (column_1(%d)),
                     KEY compound_key (id,column_1(%d)),
-                    FULLTEXT KEY fulltext_key (column_1)
-                ) ENGINE=MyISAM
+                    FULLTEXT KEY fulltext_key (column_1)" .
+                    // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+                ") $db_engine
                 ",
                 $this->max_index_length,