Changeset 37538

Timestamp:

05/23/2016 06:11:32 PM (8 years ago)

Author:

ocean90

Message:

Database: Support backticks around field names when parsing a query for the field type.

Avoids an undefined index PHP warning by dbDelta().

Props davidmosterd, ocean90.
See #20263.

Location:

trunk

Files:

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

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

@@ -2222 +2222 @@
 
                 // Get the field type from the query.
-                preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[ $tablefield_field_lowercased ], $matches);
+                preg_match( '|`?' . $tablefield->Field . '`? ([^ ]*( unsigned)?)|i', $cfields[ $tablefield_field_lowercased ], $matches );
                 $fieldtype = $matches[1];
                 $fieldtype_lowercased = strtolower( $fieldtype );

trunk/tests/phpunit/tests/dbdelta.php

@@ -465 +465 @@
             ), $result );
     }
+
+    /**
+     * @ticket 20263
+     */
+    function test_query_with_backticks_does_not_throw_an_undefined_index_warning() {
+        global $wpdb;
+
+        $schema = "
+            CREATE TABLE {$wpdb->prefix}dbdelta_test2 (
+                `id` bigint(20) NOT NULL AUTO_INCREMENT,
+                `column_1` varchar(255) NOT NULL,
+                PRIMARY KEY  (id),
+                KEY compound_key (id,column_1)
+            )
+        ";
+
+        $wpdb->query( $schema );
+
+        $updates = dbDelta( $schema, false );
+
+        $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}dbdelta_test2" );
+
+        $this->assertEmpty( $updates );
+    }
 }