Changeset 33478 for branches/4.1/tests/phpunit/tests/db/charset.php

Timestamp:

07/29/2015 06:35:00 AM (11 years ago)

Author:

pento

Message:

WPDB: Remove some of the complexities in ::strip_invalid_text() associated with switching character sets between queries. Instead of trying to dynamically change connection character sets, we now rely on the value of ::charset. This also fixes the case where queries were being blocked when DB_CHARSET was utf8, but the column character set was non-utf8.

Merge of [33308] to the 4.1 branch.

See #32165.

File:

• branches/4.1/tests/phpunit/tests/db/charset.php (modified) (4 diffs)

branches/4.1/tests/phpunit/tests/db/charset.php

@@ -244 +244 @@
                                 'expected' => str_repeat( "\xcc\xe3", 5 ),
                                 'length'   => array( 'type' => 'byte', 'length' => 10 ),
+                        ),
+                        'ujis_with_utf8_connection' => array(
+                                'charset'            => 'ujis',
+                                'connection_charset' => 'utf8',
+                                'value'              => '自動下書き',
+                                'expected'           => '自動下書き',
+                                'length'             => array( 'type' => 'byte', 'length' => 100 ),
+                        ),
+                        'ujis_with_utf8_connection_char_length' => array(
+                                'charset'            => 'ujis',
+                                'connection_charset' => 'utf8',
+                                'value'              => '自動下書き',
+                                'expected'           => '自動下書',
+                                'length'             => array( 'type' => 'char', 'length' => 4 ),
+                        ),
+                        'ujis_with_utf8_connection_byte_length' => array(
+                                'charset'            => 'ujis',
+                                'connection_charset' => 'utf8',
+                                'value'              => '自動下書き',
+                                'expected'           => '自動',
+                                'length'             => array( 'type' => 'byte', 'length' => 6 ),
                         ),
                         'false' => array(
@@ -290 +311 @@
                         $expected = $field;
                         $expected['value'] = $expected['expected'];
-                        unset( $expected['expected'], $field['expected'] );
+                        unset( $expected['expected'], $field['expected'], $expected['connection_charset'] );
 
                         // We're keeping track of these for our multiple-field test.
@@ -304 +325 @@
                 }
 
-                // Time for our test of multiple fields at once.
-                $data_provider[] = array( $multiple, $multiple_expected, 'multiple fields/charsets' );
-
                 return $data_provider;
         }
@@ -315 +333 @@
          */
         function test_strip_invalid_text( $data, $expected, $message ) {
+                $charset = self::$_wpdb->charset;
+                if ( isset( $data[0]['connection_charset'] ) ) {
+                        $new_charset = $data[0]['connection_charset'];
+                        unset( $data[0]['connection_charset'] );
+                } else {
+                        $new_charset = $data[0]['charset'];
+                }
+
+                self::$_wpdb->charset = $new_charset;
+                self::$_wpdb->set_charset( self::$_wpdb->dbh, $new_charset );
+
                 $actual = self::$_wpdb->strip_invalid_text( $data );
+
+                self::$_wpdb->charset = $charset;
+                self::$_wpdb->set_charset( self::$_wpdb->dbh, $charset );
+
                 $this->assertSame( $expected, $actual, $message );
         }