Changeset 57750

Timestamp:

03/02/2024 01:36:02 PM (5 months ago)

Author:

swissspidy

Message:

Query: Remove leading whitespace from certain database queries.

Unintended leading whitespace at the beginning of a raw MySQL query led to unexpected behavior such as broken pagination. Eliminating said whitespace avoids that.

Adds unit tests to prevent regressions.

Props wpfed, swissspidy, ironprogrammer, tadamarketing, afercia.
Fixes #56841.

Location:

trunk

Files:

• src/wp-includes/class-wp-comment-query.php (modified) (1 diff)
• src/wp-includes/class-wp-network-query.php (modified) (1 diff)
• src/wp-includes/class-wp-query.php (modified) (2 diffs)
• src/wp-includes/class-wp-site-query.php (modified) (1 diff)
• src/wp-includes/class-wp-term-query.php (modified) (1 diff)
• src/wp-includes/class-wp-user-query.php (modified) (1 diff)
• tests/phpunit/tests/comment/query.php (modified) (1 diff)
• tests/phpunit/tests/multisite/wpNetworkQuery.php (modified) (1 diff)
• tests/phpunit/tests/multisite/wpSiteQuery.php (modified) (1 diff)
• tests/phpunit/tests/post/query.php (modified) (1 diff)
• tests/phpunit/tests/term/query.php (modified) (1 diff)
• tests/phpunit/tests/user/query.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-comment-query.php

@@ -965 +965 @@
         $this->sql_clauses['limits']  = $limits;
 
-        $this->request = "
-            {$this->sql_clauses['select']}
-            {$this->sql_clauses['from']}
-            {$where}
-            {$this->sql_clauses['groupby']}
-            {$this->sql_clauses['orderby']}
-            {$this->sql_clauses['limits']}
-        ";
+        
+        
+            ']}
+            }
+            }
+            by']}
+            ']}
+        ";
 
         if ( $this->query_vars['count'] ) {

trunk/src/wp-includes/class-wp-network-query.php

@@ -482 +482 @@
         $this->sql_clauses['limits']  = $limits;
 
-        $this->request = "
-            {$this->sql_clauses['select']}
-            {$this->sql_clauses['from']}
-            {$where}
-            {$this->sql_clauses['groupby']}
-            {$this->sql_clauses['orderby']}
-            {$this->sql_clauses['limits']}
-        ";
+        
+        
+            ']}
+            }
+            }
+            by']}
+            ']}
+        ";
 
         if ( $this->query_vars['count'] ) {

trunk/src/wp-includes/class-wp-query.php

@@ -3105 +3105 @@
         }
 
-        $old_request = "
-            SELECT $found_rows $distinct $fields
-            FROM {$wpdb->posts} $join
-            WHERE 1=1 $where
-            $groupby
-            $orderby
-            $limits
-        ";
+        
+        
+            
+            
+            
+            by
+            
+        ";
 
         $this->request = $old_request;
@@ -3308 +3308 @@
                 // First get the IDs and then fill in the objects.
 
-                $this->request = "
-                    SELECT $found_rows $distinct {$wpdb->posts}.ID
-                    FROM {$wpdb->posts} $join
-                    WHERE 1=1 $where
-                    $groupby
-                    $orderby
-                    $limits
-                ";
+                
+                
+                    
+                    
+                    
+                    by
+                    
+                ";
 
                 /**

trunk/src/wp-includes/class-wp-site-query.php

@@ -696 +696 @@
         $this->sql_clauses['limits']  = $limits;
 
-        $this->request = "
-            {$this->sql_clauses['select']}
-            {$this->sql_clauses['from']}
-            {$where}
-            {$this->sql_clauses['groupby']}
-            {$this->sql_clauses['orderby']}
-            {$this->sql_clauses['limits']}
-        ";
+        
+        
+            ']}
+            }
+            }
+            by']}
+            ']}
+        ";
 
         if ( $this->query_vars['count'] ) {

trunk/src/wp-includes/class-wp-term-query.php

@@ -753 +753 @@
         $this->sql_clauses['limits']  = $limits;
 
-        $this->request = "
-            {$this->sql_clauses['select']}
-            {$this->sql_clauses['from']}
-            {$where}
-            {$this->sql_clauses['orderby']}
-            {$this->sql_clauses['limits']}
-        ";
+        
+        
+            ']}
+            }
+            }
+            ']}
+        ";
 
         $this->terms = null;

trunk/src/wp-includes/class-wp-user-query.php

@@ -819 +819 @@
 
         if ( null === $this->results ) {
-            $this->request = "
-                SELECT {$this->query_fields}
-                {$this->query_from}
-                {$this->query_where}
-                {$this->query_orderby}
-                {$this->query_limit}
-            ";
+            
+            
+                }
+                }
+                }
+                }
+            ";
             $cache_value   = false;
             $cache_key     = $this->generate_cache_key( $qv, $this->request );

trunk/tests/phpunit/tests/comment/query.php

@@ -5351 +5351 @@
         $this->assertStringNotContainsString( ' comment_ID ', $wpdb->last_query );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/tests/phpunit/tests/multisite/wpNetworkQuery.php

@@ -609 +609 @@
             return array( get_network( self::$network_ids['wordpress.org/'] ) );
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 

trunk/tests/phpunit/tests/multisite/wpSiteQuery.php

@@ -1163 +1163 @@
             return array( get_site( self::$site_ids['wordpress.org/'] ) );
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 

trunk/tests/phpunit/tests/post/query.php

@@ -793 +793 @@
         $this->assertSame( (bool) wp_using_ext_object_cache(), $filter->get_args()[0][0] );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/tests/phpunit/tests/term/query.php

@@ -1124 +1124 @@
         );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/tests/phpunit/tests/user/query.php

@@ -2379 +2379 @@
         );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
 }