Changeset 30704

Timestamp:

12/02/2014 05:11:49 AM (10 years ago)

Author:

pento

Message:

Unit Tests: The test_set_allowed_incompatible_sql_mode() test tries to set the NO_ZERO_DATE sql mode, which was removed in MySQL 5.7. This causes the test to incorrectly fail when run against MySQL 5.7.

File:

• trunk/tests/phpunit/tests/db.php (modified) (3 diffs)

trunk/tests/phpunit/tests/db.php

@@ -318 +318 @@
         $current_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
 
-        $new_modes = array( 'IGNORE_SPACE', 'NO_ZERO_DATE', 'NO_AUTO_CREATE_USER' );
+        $new_modes = array( 'IGNORE_SPACE', 'ONLY_FULL_GROUP_BY', 'NO_AUTO_CREATE_USER' );
 
         add_filter( 'incompatible_sql_modes', array( $this, 'filter_allowed_incompatible_sql_mode' ), 1, 1 );
@@ -325 +325 @@
 
         $check_new_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
-        $this->assertContains( 'NO_ZERO_DATE', explode( ',', $check_new_modes ) );
+        $this->assertContains( 'ONLY_FULL_GROUP_BY', explode( ',', $check_new_modes ) );
 
         $wpdb->set_sql_mode( explode( ',', $current_modes ) );
@@ -331 +331 @@
 
     public function filter_allowed_incompatible_sql_mode( $modes ) {
-        $pos = array_search( 'NO_ZERO_DATE', $modes );
+        $pos = array_search( 'ONLY_FULL_GROUP_BY', $modes );
         $this->assertGreaterThanOrEqual( 0, $pos );