Changeset 38591 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

09/12/2016 05:08:17 AM (3 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.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (4 diffs)

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 . '`';
                 }