Ticket #44767: 44767.diff

src/wp-admin/includes/upgrade.php

@@ -2553 +2553 @@
                         $validfield = true;
                         switch ( $fieldname_lowercased ) {
                                 case '':
+                                        continue 2;
                                 case 'primary':
                                 case 'index':
                                 case 'fulltext':
@@ -2670 +2671 @@
                         if ( array_key_exists( $tablefield_field_lowercased, $cfields ) ) {
 
                                 // Get the field type from the query.
-                                preg_match( '|`?' . $tablefield->Field . '`? ([^ ]*( unsigned)?)|i', $cfields[ $tablefield_field_lowercased ], $matches );
+                                preg_match( '|`?' . $tablefield->Field . '`?\s+([^ ]*( unsigned)?)|i', $cfields[ $tablefield_field_lowercased ], $matches );
                                 $fieldtype            = $matches[1];
                                 $fieldtype_lowercased = strtolower( $fieldtype );
 

tests/phpunit/tests/dbdelta.php

@@ -996 +996 @@
                         $updates
                 );
         }
+
+        /**
+         * @ticket 44767
+         * @ticket 36924
+         */
+        function test_ignore_change_with_space_between_column_and_type() {
+                global $wpdb;
+
+                $schema = "
+                        CREATE TABLE {$wpdb->prefix}dbdelta_test3 (
+                                `foo-bar`      varchar(255) DEFAULT NULL
+                        )
+                ";
+
+                $wpdb->query( $schema );
+
+                $schema_update = "
+                        CREATE TABLE {$wpdb->prefix}dbdelta_test3 (
+                                `foo-bar`      varchar(255) DEFAULT NULL
+                        )
+                ";
+
+                $updates = dbDelta( $schema_update );
+
+                $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}dbdelta_test3" );
+
+                $this->assertEmpty( $updates );
+        }
+
+        /**
+         * @ticket 44767
+         */
+        function test_ignore_empty_lines_completely() {
+                global $wpdb;
+
+                $schema = "
+                        CREATE TABLE {$wpdb->prefix}dbdelta_test4 (
+                                `foo-bar` varchar(255) DEFAULT NULL,
+
+                                `foo-baz` varchar(255) DEFAULT NULL
+                        )
+                ";
+
+                $wpdb->query( $schema );
+
+                $schema_update = "
+                        CREATE TABLE {$wpdb->prefix}dbdelta_test4 (
+                                `foo-bar` varchar(255) DEFAULT NULL,
+
+
+
+                                `foo-baz` varchar(255) DEFAULT NULL
+                        )
+                ";
+
+                $updates = dbDelta( $schema_update );
+
+                $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}dbdelta_test4" );
+
+                $this->assertEmpty( $updates );
+        }
 }