Ticket #24800: 24800.2.diff

includes/testcase.php

@@ -29 +29 @@
         function tearDown() {
                 global $wpdb;
                 $wpdb->query( 'ROLLBACK' );
-                remove_filter( 'dbdelta_create_queries', array( $this, '_create_temporary_tables' ) );
-                remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );
+                remove_filter( 'query', array( $this, '_create_temporary_table' ) );
+                remove_filter( 'query', array( $this, '_drop_temporary_table' ) );
                 remove_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
         }
 
@@ -56 +56 @@
                 global $wpdb;
                 $wpdb->query( 'SET autocommit = 0;' );
                 $wpdb->query( 'START TRANSACTION;' );
-                add_filter( 'dbdelta_create_queries', array( $this, '_create_temporary_tables' ) );
-                add_filter( 'query', array( $this, '_drop_temporary_tables' ) );
+                add_filter( 'query', array( $this, '_create_temporary_table' ) );
+                add_filter( 'query', array( $this, '_drop_temporary_table' ) );
         }
 
-        function _create_temporary_tables( $queries ) {
-                return str_replace( 'CREATE TABLE', 'CREATE TEMPORARY TABLE', $queries );
+        function _create_temporary_table( $query ) {
+                if ( 'CREATE TABLE' === substr( $query, 0, 12 ) )
+                        return substr_replace( $query, 'CREATE TEMPORARY TABLE', 0, 12 );
+                return $query;
         }
 
-        function _drop_temporary_tables( $query ) {
+        function _drop_temporary_table( $query ) {
                 if ( 'DROP TABLE' === substr( $query, 0, 10 ) )
-                        return 'DROP TEMPORARY TABLE ' . substr( $query, 10 );
+                        return substr_replace( $query, 'DROP TEMPORARY TABLE', 0, 10 );
                 return $query;
         }