Changeset 32412 for branches/4.1/tests/phpunit/tests/db.php

Timestamp:

05/06/2015 09:01:09 PM (10 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 4.1 branch.

Props pento, willstedt for the initial patch.

See #32090.

File:

• branches/4.1/tests/phpunit/tests/db.php (modified) (2 diffs)

branches/4.1/tests/phpunit/tests/db.php

@@ -527 +527 @@
     function data_get_table_from_query() {
         $table = 'a_test_table_name';
+        $db_table = '`a_test_db`.`another_test_table`';
 
         $queries = array(
@@ -629 +630 @@
         );
 
-        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;