Ticket #34872: 34872.patch

tests/phpunit/tests/dbdelta.php

@@ -274 +274 @@
                 $this->assertEmpty( $updates );
         }
 
+        /**
+         * @ticket 34872
+         *
+         * @dataProvider data_provider_schema_indexes
+         *
+         * @param string $schema The table schema.
+         */
+        public function test_no_duplicate_indexes( $schema ) {
+
+                // Run once to create the table and indexes.
+                $updates = dbDelta( $schema );
+
+                $this->assertCount( 1, $updates );
+                $this->assertEquals(
+                        array( 'wptests_dbdelta_test_2' => 'Created table wptests_dbdelta_test_2' )
+                        , $updates
+                );
+
+                // Run again. Nothing should happen.
+                $updates = dbDelta( $schema );
+
+                $this->assertSame( array(), $updates );
+        }
+
+        /**
+         * Provides sets of table schemas to test index detection.
+         *
+         * @return array
+         */
+        public function data_provider_schema_indexes() {
+
+                global $wpdb;
+
+                return array(
+                        'named' => array(
+                                "CREATE TABLE {$wpdb->prefix}dbdelta_test_2 (
+                                        id bigint(20) NOT NULL AUTO_INCREMENT,
+                                        KEY id (id)
+                                )"
+                        ),
+                        'unnamed' => array(
+                                "CREATE TABLE {$wpdb->prefix}dbdelta_test_2 (
+                                        id bigint(20) NOT NULL AUTO_INCREMENT,
+                                        KEY (id)
+                                )"
+                        ),
+                        'primary' => array(
+                                "CREATE TABLE {$wpdb->prefix}dbdelta_test_2 (
+                                        id bigint(20) NOT NULL AUTO_INCREMENT,
+                                        PRIMARY KEY (id)
+                                )"
+                        ),
+                        'primary_extra_space' => array(
+                                "CREATE TABLE {$wpdb->prefix}dbdelta_test_2 (
+                                        id bigint(20) NOT NULL AUTO_INCREMENT,
+                                        PRIMARY KEY  (id)
+                                )"
+                        ),
+                );
+        }
+
         //
         // Assertions.
         //

src/wp-admin/includes/upgrade.php

@@ -2256 +2256 @@
                                 if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) {
                                         $index_string .= 'FULLTEXT ';
                                 }
-                                $index_string .= 'KEY ';
-                                if ($index_name != 'PRIMARY') {
-                                        $index_string .= $index_name;
-                                }
+                                $index_string .= 'KEY';
+
                                 $index_columns = '';
 
                                 // For each column in the index.
@@ -2277 +2275 @@
                                 $alt_index_columns = preg_replace( '/\([^)]*\)/', '', $index_columns );
 
                                 // Add the column list to the index create string.
+                                if ( 'PRIMARY' === $index_name ) {
+                                        $index_name = '';
+                                }
+
                                 $index_strings = array(
                                         "$index_string ($index_columns)",
                                         "$index_string ($alt_index_columns)",
+                                        "$index_string $index_name ($index_columns)",
+                                        "$index_string $index_name ($alt_index_columns)",
                                 );
 
                                 foreach ( $index_strings as $index_string ) {