Changeset 33259

Timestamp:

07/14/2015 10:18:57 AM (9 years ago)

Author:

pento

Message:

WPDB: When extracting the table name from a query, we had a 1000 character limit on the SQL string that would be searched. This was a hangover from when the code was imported from HyperDB, and isn't appropriate for Core, where a wider range of queries are likely to be run.

Fixes #32763

Location:

trunk

Files:

• src/wp-includes/wp-db.php (modified) (1 diff)
• tests/phpunit/tests/db.php (modified) (2 diffs)

trunk/src/wp-includes/wp-db.php

@@ -2869 +2869 @@
         $query = ltrim( $query, "\r\n\t (" );
 
-        /*
-         * Strip everything between parentheses except nested selects and use only 1,000
-         * chars of the query.
-         */
-        $query = preg_replace( '/\((?!\s*select)[^(]*?\)/is', '()', substr( $query, 0, 1000 ) );
+        // Strip everything between parentheses except nested selects.
+        $query = preg_replace( '/\((?!\s*select)[^(]*?\)/is', '()', $query );
 
         // Quickly match most common queries.

trunk/tests/phpunit/tests/db.php

@@ -534 +534 @@
             "SELECT * FROM `$table`",
 
+            "SELECT * FROM (SELECT * FROM $table) as subquery",
+
             "INSERT $table",
             "INSERT IGNORE $table",
@@ -628 +630 @@
             "SHOW CREATE TABLE $table",
             "SHOW INDEX FROM $table",
+
+            // @ticket 32763
+            "SELECT " . str_repeat( 'a', 10000 ) . " FROM (SELECT * FROM $table) as subquery",
         );