Skip to content

Do not return a non-existent update when tablename contains backticks #9888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
leewillis77 wants to merge 1 commit into from
Closed

Do not return a non-existent update when tablename contains backticks #9888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/wp-admin/includes/upgrade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2962,8 +2962,8 @@ 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];
$cqueries[ trim( $matches[1], '`' ) ] = $qry;
$for_update[ trim( $matches[1], '`' ) ] = 'Created table ' . $matches[1];
continue;
}

Expand Down
22 changes: 22 additions & 0 deletions tests/phpunit/tests/db/dbDelta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,4 +1090,26 @@ public function test_column_type_change_with_hyphens_in_name() {
$updates
);
}

public function test_no_update_reported_when_tablename_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,
column_2 text,
column_3 blob,
PRIMARY KEY (id),
KEY key_1 (column_1($this->max_index_length)),
KEY compound_key (id,column_1($this->max_index_length)),
FULLTEXT KEY fulltext_key (column_1)
) {$this->db_engine}
",
false
);

$this->assertEmpty( $updates );
}
}
Loading