Changeset 41818

Timestamp:

10/10/2017 11:45:35 PM (6 years ago)

Author:

pento

Message:

Database: Fix a test failing on MySQL 5.7 and MariaDB 10.2.

On newer versions of MySQL, an error was being thrown when creating a table with an index that we wanted to be silently truncated.

To avoid this, the test now tries to use a newer InnoDB file format where available, and skips the test when that happens.

Props pento, danielbachhuber, straussd.
Fixes #41716.

File:

• trunk/tests/phpunit/tests/dbdelta.php (modified) (1 diff)

trunk/tests/phpunit/tests/dbdelta.php

@@ -362 +362 @@
         }
 
-        $table_name = 'test_truncated_index';
-
-        $create = "CREATE TABLE $table_name (\n a varchar(255) COLLATE utf8mb4_unicode_ci,\n KEY a (a)\n)";
+        // This table needs to be actually created
+        remove_filter( 'query', array( $this, '_create_temporary_tables' ) );
+        remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );
+
+        $table_name = "{$wpdb->prefix}test_truncated_index";
+
+        $create = "
+            CREATE TABLE $table_name (
+                a varchar(255) COLLATE utf8mb4_unicode_ci,
+                KEY a_key (a)
+            ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC";
+
         $wpdb->query( $create );
 
+        $index = $wpdb->get_row( "SHOW INDEXES FROM $table_name WHERE Key_name='a_key';" );
+
         $actual = dbDelta( $create, false );
+
+        $wpdb->query( "DROP TABLE IF EXISTS $table_name;" );
+
+        if ( 191 != $index->Sub_part ) {
+            $this->markTestSkipped( "This test requires the index to be truncated." );
+        }
 
         $this->assertSame( array(), $actual );