Changeset 38591

Timestamp:

09/12/2016 05:08:17 AM (8 years ago)

Author:

pento

Message:

Database: Normalise index names in dbDelta().

When comparing index definitions, normalise the index names to lower case, as they are not case sensitive within MySQL.

Fixes #34874.

Location:

trunk

Files:

• src/wp-admin/includes/upgrade.php (modified) (4 diffs)
• tests/phpunit/tests/dbdelta.php (modified) (1 diff)

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

@@ -2284 +2284 @@
 
                     // Escape the index name with backticks. An index for a primary key has no name.
-                    $index_name = ( 'PRIMARY KEY' === $index_type ) ? '' : '`' . $index_matches['index_name'] . '`';
+                    $index_name = ( 'PRIMARY KEY' === $index_type ) ? '' : '`' . strtolower( $index_matches['index_name'] ) . '`';
 
                     // Parse the columns. Multiple columns are separated by a comma.
@@ -2408 +2408 @@
 
                 // Add the index to the index data array.
-                $keyname = $tableindex->Key_name;
+                $keyname = strtolower( $tableindex->Key_name );
                 $index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
                 $index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
@@ -2419 +2419 @@
                 // Build a create string to compare to the query.
                 $index_string = '';
-                if ($index_name == 'PRIMARY') {
+                if ($index_name == 'primary') {
                     $index_string .= 'PRIMARY ';
                 } elseif ( $index_data['unique'] ) {
@@ -2431 +2431 @@
                 }
                 $index_string .= 'KEY ';
-                if ( 'PRIMARY' !== $index_name  ) {
+                if ( 'primary' !== $index_name  ) {
                     $index_string .= '`' . $index_name . '`';
                 }

trunk/tests/phpunit/tests/dbdelta.php

@@ -804 +804 @@
 
     /**
+     * @ticket 34874
+     */
+    function test_key_names_are_not_case_sensitive_and_do_not_recreate_indices() {
+        global $wpdb;
+
+        $updates = dbDelta(
+            "
+            CREATE TABLE {$wpdb->prefix}dbdelta_test (
+                id bigint(20) NOT NULL AUTO_INCREMENT,
+                column_1 varchar(255) NOT NULL,
+                column_2 text,
+                column_3 blob,
+                PRIMARY KEY  (id),
+                KEY KEY_1 (column_1),
+                KEY compOUND_key (id,column_1),
+                FULLTEXT KEY FULLtext_kEY (column_1)
+            ) ENGINE=MyISAM
+            ", false );
+
+        $this->assertEmpty( $updates );
+    }
+
+    /**
      * @ticket 31679
      */