Changeset 32416

Timestamp:

05/06/2015 09:13:49 PM (11 years ago)

Author:

johnbillion

Message:

WPDB: Allow queries to reference tables in the dbname.tablename format, and allow table names to contain any valid character, rather than just ASCII.

Merge of [32368] to the 3.7 branch.

Props pento, willstedt for the initial patch.

See #32090.

Location:

branches/3.7

Files:

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

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

@@ -1825 +1825 @@
 
                 $charsets = $columns = array();
-                $results = $this->get_results( "SHOW FULL COLUMNS FROM `$table`" );
+
+                $table_parts = explode( '.', $table );
+                $table = '`' . implode( '`.`', $table_parts ) . '`';
+                $results = $this->get_results( "SHOW FULL COLUMNS FROM $table" );
                 if ( ! $results ) {
                         return new WP_Error( 'wpdb_get_table_charset_failure' );
@@ -2398 +2401 @@
                                 . '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
                                 . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?'
-                                . ')\s+`?([\w-]+)`?/is', $query, $maybe ) ) {
-                        return $maybe[1];
+                                . ')\s+((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) {
+                        return str_replace( '`', '', $maybe[1] );
                 }
 
@@ -2406 +2409 @@
                                 . '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([\w-]+)\W/is', $query, $maybe ) ) {
-                        return $maybe[1];
+                                . ')\W((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) {
+                        return str_replace( '`', '', $maybe[1] );
                 }
 
@@ -2425 +2428 @@
                                 . '|(?:GRANT|REVOKE).*ON\s+TABLE'
                                 . '|SHOW\s+(?:.*FROM|.*TABLE)'
-                                . ')\s+\(*\s*`?([\w-]+)`?\s*\)*/is', $query, $maybe ) ) {
-                        return $maybe[1];
+                                . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) {
+                        return str_replace( '`', '', $maybe[1] );
                 }
 

branches/3.7/tests/phpunit/tests/db.php

@@ -291 +291 @@
         function data_get_table_from_query() {
                 $table = 'a_test_table_name';
+                $db_table = '`a_test_db`.`another_test_table`';
 
                 $queries = array(
@@ -393 +394 @@
                 );
 
-                foreach ( $queries as &$query ) {
-                        $query = array( $query, $table );
+                $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 );
+
+                        $queries[ $ii ] = array( $queries[ $ii ], $table );
+                        $queries[] = array( $db_query, $expected_db_table );
                 }
                 return $queries;