Changeset 32232 for trunk/tests/phpunit/tests/db/charset.php

Timestamp:

04/21/2015 05:10:11 AM (10 years ago)

Author:

pento

Message:

WPDB: When deciding if a query needs extra sanity checking based on collation, we can quickly return if it's a query that will never return user data.

Fixes #32029.

File:

• trunk/tests/phpunit/tests/db/charset.php (modified) (3 diffs)

trunk/tests/phpunit/tests/db/charset.php

@@ -506 +506 @@
             $value[2] = "SELECT * FROM $this_table_name";
             $value[3] = "DROP TABLE IF EXISTS $this_table_name";
+            $value[4] = array(
+                "SHOW FULL TABLES LIKE $this_table_name",
+                "DESCRIBE $this_table_name",
+                "DESC $this_table_name",
+                "EXPLAIN SELECT * FROM $this_table_name",
+            );
         }
         unset( $value );
@@ -517 +523 @@
      * @ticket 21212
      */
-    function test_table_collation_check( $create, $expected, $query, $drop ) {
+    function test_table_collation_check( $create, $expected, $query, $drop, $always_true ) {
         self::$_wpdb->query( $drop );
 
@@ -525 +531 @@
         $this->assertEquals( $expected, $return );
 
+        foreach( $always_true as $true_query ) {
+            $return = self::$_wpdb->check_safe_collation( $true_query );
+            $this->assertTrue( $return );
+        }
+
         self::$_wpdb->query( $drop );
     }