Changeset 34655

Timestamp:

09/28/2015 01:16:29 AM (10 years ago)

Author:

pento

Message:

WPDB: Make sure we don't run sanity checks on DB dropins.

Previously, we'd run the sanity checks if is_mysql was not set to false. This caused problems for DB drop-ins that didn't define is_mysql at all. Instead, we can just check if is_mysql is empty().

Also fix some unit tests that accidently ran correctly because of the strict false === comparison.

Fixes #33501.

Location:

trunk

Files:

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

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

@@ -2415 +2415 @@
 
         // Skip this entirely if this isn't a MySQL database.
-        if ( false === $this->is_mysql ) {
+        if ( empty( $this->is_mysql ) ) {
             return false;
         }
@@ -2464 +2464 @@
 
         // Skip this entirely if this isn't a MySQL database.
-        if ( false === $this->is_mysql ) {
+        if ( empty( $this->is_mysql ) ) {
             return false;
         }

trunk/tests/phpunit/includes/utils.php

@@ -381 +381 @@
         $this->dbh = $wpdb->dbh;
         $this->use_mysqli = $wpdb->use_mysqli;
+        $this->is_mysql = $wpdb->is_mysql;
         $this->ready = true;
         $this->field_types = $wpdb->field_types;

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

@@ -639 +639 @@
 
     /**
+     * @dataProvider data_test_get_column_charset
+     * @ticket 33501
+     */
+    function test_get_column_charset_is_mysql_undefined( $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;
+        }
+
+        unset( self::$_wpdb->is_mysql );
+
+        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;
+    }
+
+    /**
      * @ticket 21212
      */