Changeset 27086

Timestamp:

02/03/2014 10:39:47 PM (11 years ago)

Author:

nacin

Message:

Test suite: Trim queries before deciding whether to create temporary tables.

props jdgrimes.
fixes #24800.

File:

• trunk/tests/phpunit/includes/testcase.php (modified) (2 diffs)

trunk/tests/phpunit/includes/testcase.php

@@ -36 +36 @@
         $this->expectedDeprecated();
         $wpdb->query( 'ROLLBACK' );
-        remove_filter( 'query', array( $this, '_create_temporary_table' ) );
-        remove_filter( 'query', array( $this, '_drop_temporary_table' ) );
+        remove_filter( 'query', array( $this, '_create_temporary_tables' ) );
+        remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );
         remove_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
     }
@@ -65 +65 @@
         $wpdb->query( 'SET autocommit = 0;' );
         $wpdb->query( 'START TRANSACTION;' );
-        add_filter( 'query', array( $this, '_create_temporary_table' ) );
-        add_filter( 'query', array( $this, '_drop_temporary_table' ) );
-    }
-
-    function _create_temporary_table( $query ) {
-        if ( 'CREATE TABLE' === substr( $query, 0, 12 ) )
-            return substr_replace( $query, 'CREATE TEMPORARY TABLE', 0, 12 );
+        add_filter( 'query', array( $this, '_create_temporary_tables' ) );
+        add_filter( 'query', array( $this, '_drop_temporary_tables' ) );
+    }
+
+    function _create_temporary_tables( $query ) {
+        if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) )
+            return substr_replace( trim( $query ), 'CREATE TEMPORARY TABLE', 0, 12 );
         return $query;
     }
 
-    function _drop_temporary_table( $query ) {
-        if ( 'DROP TABLE' === substr( $query, 0, 10 ) )
-            return substr_replace( $query, 'DROP TEMPORARY TABLE', 0, 10 );
+    function _drop_temporary_tables( $query ) {
+        if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) )
+            return substr_replace( trim( $query ), 'DROP TEMPORARY TABLE', 0, 10 );
         return $query;
     }