Changeset 32239

Timestamp:

04/21/2015 06:57:58 AM (11 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.

Location:

branches/3.9

Files:

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

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

@@ -2336 +2336 @@
                         return true;
                 }
+
+                // 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;
+                }
+
+                // All-ASCII queries don't need extra checking.
+                if ( $this->check_ascii( $query ) ) {
+                        return true;
+                }
+
                 $table = $this->get_table_from_query( $query );
                 if ( ! $table ) {
@@ -2342 +2354 @@
 
                 $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 );
@@ -2350 +2367 @@
                 }
 
+                // 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 ) ) {
@@ -2377 +2395 @@
          *                        remove invalid characters, a {@see WP_Error} object is returned.
          */
+                // If any of the columns don't have one of these collations, it needs more sanity checking.
         protected function strip_invalid_text( $data ) {
                 // Some multibyte character sets that we can check in PHP.

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