Changeset 60782

Timestamp:

09/19/2025 11:58:02 AM (6 months ago)

Author:

SergeyBiryukov

Message:

Database: Do not report an extra update in dbDelta() with backticks in table name.

Follow-up to [10948], [20704].

Props leewillis77, swissspidy, johnbillion, SergeyBiryukov.
Fixes #63976.

Location:

trunk

Files:

• src/wp-admin/includes/upgrade.php (modified) (1 diff)
• tests/phpunit/tests/db/dbDelta.php (modified) (2 diffs)

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

@@ -2963 +2963 @@
     foreach ( $queries as $qry ) {
         if ( preg_match( '|CREATE TABLE ([^ ]*)|', $qry, $matches ) ) {
-            $cqueries[ trim( $matches[1], '`' ) ] = $qry;
-            $for_update[ $matches[1] ]            = 'Created table ' . $matches[1];
+            $table_name = trim( $matches[1], '`' );
+
+            $cqueries[ $table_name ]   = $qry;
+            $for_update[ $table_name ] = 'Created table ' . $matches[1];
             continue;
         }

trunk/tests/phpunit/tests/db/dbDelta.php

@@ -142 +142 @@
 
     /**
-     * Test that it does nothing for an existing table.
+     * Test that no update is reported for an existing table.
      */
     public function test_existing_table() {
@@ -157 +157 @@
                 KEY compound_key (id,column_1($this->max_index_length))
             )
-            "
+            ",
+            false
+        );
+
+        $this->assertSame( array(), $updates );
+    }
+
+    /**
+     * Test that no update is reported for an existing table name in backticks.
+     *
+     * @ticket 63976
+     */
+    public function test_existing_table_name_in_backticks() {
+
+        global $wpdb;
+
+        $updates = dbDelta(
+            "
+            CREATE TABLE `{$wpdb->prefix}dbdelta_test` (
+                id bigint(20) NOT NULL AUTO_INCREMENT,
+                column_1 varchar(255) NOT NULL,
+                PRIMARY KEY  (id),
+                KEY key_1 (column_1($this->max_index_length)),
+                KEY compound_key (id,column_1($this->max_index_length))
+            )
+            ",
+            false
         );