Changeset 33994

Timestamp:

09/10/2015 07:04:04 AM (11 years ago)

Author:

pento

Message:

WPDB: get_table_from_query() didn't find table names with hyphens in them.

Merge of [33718] to the 4.0 branch.

Props dustinbolton, pento.

See #33470.

Location:

branches/4.0

Files:

• src/wp-includes/wp-db.php (modified) (3 diffs)
• tests/phpunit/tests/db.php (modified) (2 diffs)

branches/4.0/src/wp-includes/wp-db.php

@@ -2822 +2822 @@
                                 . '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
                                 . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?'
-                                . ')\s+((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) {
+                                . ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) {
                         return str_replace( '`', '', $maybe[1] );
                 }
@@ -2830 +2830 @@
                                 . 'SHOW\s+TABLE\s+STATUS.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
                                 . '|SHOW\s+(?:FULL\s+)?TABLES.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
-                                . ')\W((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) {
+                                . ')\W((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) {
                         return str_replace( '`', '', $maybe[1] );
                 }
@@ -2849 +2849 @@
                                 . '|(?:GRANT|REVOKE).*ON\s+TABLE'
                                 . '|SHOW\s+(?:.*FROM|.*TABLE)'
-                                . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) {
+                                . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) {
                         return str_replace( '`', '', $maybe[1] );
                 }

branches/4.0/tests/phpunit/tests/db.php

@@ -492 +492 @@
         function data_get_table_from_query() {
                 $table = 'a_test_table_name';
-                $db_table = '`a_test_db`.`another_test_table`';
+                $more_tables = array(
+                        // table_name => expected_value
+                        '`a_test_db`.`another_test_table`' => 'a_test_db.another_test_table',
+                        'a-test-with-dashes'               => 'a-test-with-dashes',
+                );
 
                 $queries = array(
@@ -597 +601 @@
                 $querycount = count( $queries );
                 for ( $ii = 0; $ii < $querycount; $ii++ ) {
-                        $db_query = str_replace( $table, $db_table, $queries[ $ii ] );
-                        $expected_db_table = str_replace( '`', '', $db_table );
+                        foreach ( $more_tables as $name => $expected_name ) {
+                                $new_query = str_replace( $table, $name, $queries[ $ii ] );
+                                $queries[] = array( $new_query, $expected_name );
+                        }
 
                         $queries[ $ii ] = array( $queries[ $ii ], $table );
-                        $queries[] = array( $db_query, $expected_db_table );
                 }
                 return $queries;