Changeset 34655
- Timestamp:
- 09/28/2015 01:16:29 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/wp-db.php
r34529 r34655 2415 2415 2416 2416 // Skip this entirely if this isn't a MySQL database. 2417 if ( false === $this->is_mysql) {2417 if ( empty( $this->is_mysql ) ) { 2418 2418 return false; 2419 2419 } … … 2464 2464 2465 2465 // Skip this entirely if this isn't a MySQL database. 2466 if ( false === $this->is_mysql) {2466 if ( empty( $this->is_mysql ) ) { 2467 2467 return false; 2468 2468 } -
trunk/tests/phpunit/includes/utils.php
r34215 r34655 381 381 $this->dbh = $wpdb->dbh; 382 382 $this->use_mysqli = $wpdb->use_mysqli; 383 $this->is_mysql = $wpdb->is_mysql; 383 384 $this->ready = true; 384 385 $this->field_types = $wpdb->field_types; -
trunk/tests/phpunit/tests/db/charset.php
r33425 r34655 639 639 640 640 /** 641 * @dataProvider data_test_get_column_charset 642 * @ticket 33501 643 */ 644 function test_get_column_charset_is_mysql_undefined( $drop, $create, $table, $columns ) { 645 self::$_wpdb->query( $drop ); 646 647 if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) { 648 $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." ); 649 return; 650 } 651 652 unset( self::$_wpdb->is_mysql ); 653 654 self::$_wpdb->query( $create ); 655 656 $columns = array_keys( $columns ); 657 foreach ( $columns as $column => $charset ) { 658 $this->assertEquals( false, self::$_wpdb->get_col_charset( $table, $column ) ); 659 } 660 661 self::$_wpdb->query( $drop ); 662 663 self::$_wpdb->is_mysql = true; 664 } 665 666 /** 641 667 * @ticket 21212 642 668 */
Note: See TracChangeset
for help on using the changeset viewer.