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.

git-svn-id: https://develop.svn.wordpress.org/trunk@60782 602fd350-edb4-49c9-b593-d223f7449a82

Author: SergeyBiryukov

src/wp-admin/includes/upgrade.php

@@ -2962,8 +2962,10 @@ function dbDelta( $queries = '', $execute = true ) { // phpcs:ignore WordPress.N
 	// Create a tablename index for an array ($cqueries) of recognized query types.
 	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;
 		}
 

tests/phpunit/tests/db/dbDelta.php

@@ -141,7 +141,7 @@ public function test_creating_a_table() {
 	}
 
 	/**
-	 * Test that it does nothing for an existing table.
+	 * Test that no update is reported for an existing table.
 	 */
 	public function test_existing_table() {
 
@@ -156,7 +156,33 @@ public function test_existing_table() {
 				KEY key_1 (column_1($this->max_index_length)),
 				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
 		);
 
 		$this->assertSame( array(), $updates );