Changeset 30375

Timestamp:

11/18/2014 03:37:23 AM (10 years ago)

Author:

pento

Message:

WPDB: When a db.php drop-in is being used, and it doesn't explicitly define itself as connecting to MySQL, skip the character set checks. This ensures that existing drop-ins won't accidentally run checks that they don't support.

See #21212.

Location:

trunk

Files:

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

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

@@ -2212 +2212 @@
 
         foreach ( $columns as $column ) {
-            if ( $column->Collation ) {
+            if ( ! empty( $column->Collation ) ) {
                 list( $charset ) = explode( '_', $column->Collation );
                 $charsets[ strtolower( $charset ) ] = true;
@@ -2238 +2238 @@
         } elseif ( 0 === $count ) {
             // No charsets, assume this table can store whatever.
-            $charset = 'latin1';
+            $charset = false;
         } else {
             // More than one charset. Remove latin1 if present and recalculate.
@@ -2292 +2292 @@
         }
 
+        // Skip this entirely if this isn't a MySQL database.
+        if ( false === $this->is_mysql ) {
+            return false;
+        }
+
         if ( empty( $this->table_charset[ $table ] ) ) {
             // This primes column information for us.
@@ -2379 +2384 @@
             $charset = $value['charset'];
 
-            // latin1 will happily store anything.
-            if ( 'latin1' === $charset ) {
+            // Column isn't a string, or is latin1, which will will happily store anything.
+            if ( false === $charset || 'latin1' === $charset ) {
                 continue;
             }
 
-            // Column or value isn't a string.
-            if ( false === $charset || ! is_string( $value['value'] ) ) {
+            if ( ! is_string( $value['value'] ) ) {
                 continue;
             }

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

@@ -232 +232 @@
         array(
             'definition'      => '( a INT, b FLOAT )',
-            'table_expected'  => 'latin1',
+            'table_expected'  => false,
             'column_expected' => array( 'a' => false, 'b' => false )
         ),
@@ -345 +345 @@
 
         self::$_wpdb->query( $drop );
+    }
+
+    /**
+     * @dataProvider data_test_get_column_charset
+     * @ticket 21212
+     */
+    function test_get_column_charset_non_mysql( $drop, $create, $table, $columns ) {
+        self::$_wpdb->query( $drop );
+
+        if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
+            $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
+            return;
+        }
+
+        self::$_wpdb->is_mysql = false;
+
+        self::$_wpdb->query( $create );
+
+        $columns = array_keys( $columns );
+        foreach ( $columns as $column => $charset ) {
+            $this->assertEquals( false, self::$_wpdb->get_col_charset( $table, $column ) );
+        }
+
+        self::$_wpdb->query( $drop );
+
+        self::$_wpdb->is_mysql = true;
     }