Changeset 32232

Timestamp:

04/21/2015 05:10:11 AM (9 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.

Location:

trunk

Files:

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

trunk/src/wp-includes/wp-db.php

@@ -2400 +2400 @@
         }
 
+        // We don't need to check the collation for queries that don't read data.
+        $query = ltrim( $query, "\r\n\t (" );
+        if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN)\s/i', $query ) ) {
+            return true;
+        }
+
         $table = $this->get_table_from_query( $query );
         if ( ! $table ) {
@@ -2406 +2412 @@
 
         $this->checking_collation = true;
-        $this->get_table_charset( $table );
+        $collation = $this->get_table_charset( $table );
         $this->checking_collation = false;
+
+        // Tables with no collation, or latin1 only, don't need extra checking.
+        if ( false === $collation || 'latin1' === $collation ) {
+            return true;
+        }
 
         $table = strtolower( $table );
@@ -2414 +2425 @@
         }
 
+        // If any of the columns don't have one of these collations, it needs more sanity checking.
         foreach( $this->col_meta[ $table ] as $col ) {
             if ( empty( $col->Collation ) ) {

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 );
     }