Changeset 35487

Timestamp:

11/01/2015 11:09:49 PM (9 years ago)

Author:

pento

Message:

Upgrades: Add support for FULLTEXT indexes to dbDelta().

Props edirect24, mdawaffe, pento.

Fixes #14445.

Location:

trunk

Files:

• src/wp-admin/includes/upgrade.php (modified) (2 diffs)
• tests/phpunit/tests/dbdelta.php (modified) (3 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -2196 +2196 @@
                 $index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
                 $index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
+                $index_ary[$keyname]['index_type'] = $tableindex->Index_type;
             }
 
@@ -2207 +2208 @@
                 } elseif ( $index_data['unique'] ) {
                     $index_string .= 'UNIQUE ';
+                }
+                if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) {
+                    $index_string .= 'FULLTEXT ';
                 }
                 $index_string .= 'KEY ';

trunk/tests/phpunit/tests/dbdelta.php

@@ -26 +26 @@
         global $wpdb;
 
+        // Forcing MyISAM, because InnoDB only started supporting FULLTEXT indexes in MySQL 5.7.
         $wpdb->query(
             "
@@ -33 +34 @@
                 PRIMARY KEY  (id),
                 KEY key_1 (column_1),
-                KEY compoud_key (id,column_1)
-            )
+                KEY compoud_key (id,column_1),
+                FULLTEXT KEY fulltext_key (column_1)
+            ) ENGINE=MyISAM
             "
         );
@@ -249 +251 @@
 
     }
-    
+
+    /**
+     * Test that FULLTEXT indexes are detected.
+     * @ticket 14445
+     */
+    public function test_fulltext_index() {
+        global $wpdb;
+
+        $updates = dbDelta(
+            "
+            CREATE TABLE {$wpdb->prefix}dbdelta_test (
+                id bigint(20) NOT NULL AUTO_INCREMENT,
+                column_1 varchar(255) NOT NULL,
+                PRIMARY KEY  (id),
+                KEY key_1 (column_1),
+                KEY compoud_key (id,column_1),
+                FULLTEXT KEY fulltext_key (column_1)
+            )
+            ", false
+        );
+
+        $this->assertEmpty( $updates );
+    }
+
     //
     // Assertions.