WordPress.org

Make WordPress Core

Changeset 32234


Ignore:
Timestamp:
04/21/2015 05:43:33 AM (5 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 4.1 branch.

See #32029.

Location:
branches/4.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.1/src/wp-includes/wp-db.php

    r32223 r32234  
    23732373            return true;
    23742374        }
     2375
     2376        // We don't need to check the collation for queries that don't read data.
     2377        $query = ltrim( $query, "\r\n\t (" );
     2378        if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN)\s/i', $query ) ) {
     2379            return true;
     2380        }
     2381
     2382        // All-ASCII queries don't need extra checking.
     2383        if ( $this->check_ascii( $query ) ) {
     2384            return true;
     2385        }
     2386
    23752387        $table = $this->get_table_from_query( $query );
    23762388        if ( ! $table ) {
     
    23792391
    23802392        $this->checking_collation = true;
    2381         $this->get_table_charset( $table );
     2393        $collation = $this->get_table_charset( $table );
    23822394        $this->checking_collation = false;
     2395
     2396        // Tables with no collation, or latin1 only, don't need extra checking.
     2397        if ( false === $collation || 'latin1' === $collation ) {
     2398            return true;
     2399        }
    23832400
    23842401        $table = strtolower( $table );
     
    23872404        }
    23882405
     2406        // If any of the columns don't have one of these collations, it needs more sanity checking.
    23892407        foreach( $this->col_meta[ $table ] as $col ) {
    23902408            if ( empty( $col->Collation ) ) {
     
    24142432     *                        remove invalid characters, a {@see WP_Error} object is returned.
    24152433     */
     2434        // If any of the columns don't have one of these collations, it needs more sanity checking.
    24162435    protected function strip_invalid_text( $data ) {
    24172436        // Some multibyte character sets that we can check in PHP.
  • branches/4.1/tests/phpunit/tests/db/charset.php

    r32223 r32234  
    500500
    501501            $value[0] = "CREATE TABLE $this_table_name {$value[0]}";
    502             $value[2] = "SELECT * FROM $this_table_name";
     502            $value[2] = "SELECT * FROM $this_table_name WHERE a='\xf0\x9f\x98\x88'";
    503503            $value[3] = "DROP TABLE IF EXISTS $this_table_name";
     504            $value[4] = array(
     505                "SELECT * FROM $this_table_name WHERE a='foo'",
     506                "SHOW FULL TABLES LIKE $this_table_name",
     507                "DESCRIBE $this_table_name",
     508                "DESC $this_table_name",
     509                "EXPLAIN SELECT * FROM $this_table_name",
     510            );
    504511        }
    505512        unset( $value );
     
    513520     * @ticket 21212
    514521     */
    515     function test_table_collation_check( $create, $expected, $query, $drop ) {
     522    function test_table_collation_check( $create, $expected, $query, $drop, $always_true ) {
    516523        self::$_wpdb->query( $drop );
    517524
     
    521528        $this->assertEquals( $expected, $return );
    522529
     530        foreach( $always_true as $true_query ) {
     531            $return = self::$_wpdb->check_safe_collation( $true_query );
     532            $this->assertTrue( $return );
     533        }
     534
    523535        self::$_wpdb->query( $drop );
    524536    }
Note: See TracChangeset for help on using the changeset viewer.