Changeset 32239 for branches/3.9/tests/phpunit/tests/db/charset.php

Timestamp:

04/21/2015 06:57:58 AM (9 years ago)

Author:

pento

Message:

WPDB: When deciding if a query needs extra sanity checking based on collation, return early when we can. Merges [32232] and [32233] to the 3.9 branch.

See #32029.

File:

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

branches/3.9/tests/phpunit/tests/db/charset.php

@@ -500 +500 @@
 
             $value[0] = "CREATE TABLE $this_table_name {$value[0]}";
-            $value[2] = "SELECT * FROM $this_table_name";
+            $value[2] = "SELECT * FROM $this_table_name WHERE a='\xf0\x9f\x98\x88'";
             $value[3] = "DROP TABLE IF EXISTS $this_table_name";
+            $value[4] = array(
+                "SELECT * FROM $this_table_name WHERE a='foo'",
+                "SHOW FULL TABLES LIKE $this_table_name",
+                "DESCRIBE $this_table_name",
+                "DESC $this_table_name",
+                "EXPLAIN SELECT * FROM $this_table_name",
+            );
         }
         unset( $value );
@@ -513 +520 @@
      * @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 );
 
@@ -521 +528 @@
         $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 );
     }