Changeset 42062 for branches/4.3/tests/phpunit/tests/date/query.php

Timestamp:

10/31/2017 12:48:20 PM (8 years ago)

Author:

pento

Message:

Database: Restore numbered placeholders in wpdb::prepare().

[41496] removed support for numbered placeholders in queries send through wpdb::prepare(), which, despite being undocumented, were quite commonly used.

This change restores support for numbered placeholders (as well as a subset of placeholder formatting), while also adding extra checks to ensure the correct number of arguments are being passed to wpdb::prepare(), given the number of placeholders.

Merges [41662], [42056] to the 4.3 branch.
See #41925.

Location:

branches/4.3

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/date/query.php (modified) (4 diffs)

branches/4.3/tests/phpunit/tests/date/query.php

@@ -602 +602 @@
 
     public function test_build_time_query_hour_minute() {
+        global $wpdb;
         $q = new WP_Date_Query( array() );
 
@@ -608 +609 @@
         // $compare value is floating point - use regex to account for
         // varying precision on different PHP installations
-        $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i' \) = 5\.150*/", $found );
+        $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i' \) = 5\.150*/", $wpdb->remove_placeholder_escape( $found ) );
     }
 
     public function test_build_time_query_hour_minute_second() {
+        global $wpdb;
         $q = new WP_Date_Query( array() );
 
@@ -618 +620 @@
         // $compare value is floating point - use regex to account for
         // varying precision on different PHP installations
-        $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i%s' \) = 5\.15350*/", $found );
+        $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i%s' \) = 5\.15350*/", $wpdb->remove_placeholder_escape( $found ) );
     }
 
     public function test_build_time_query_minute_second() {
+        global $wpdb;
         $q = new WP_Date_Query( array() );
 
@@ -628 +631 @@
         // $compare value is floating point - use regex to account for
         // varying precision on different PHP installations
-        $this->assertRegExp( "/DATE_FORMAT\( post_date, '0\.%i%s' \) = 0\.15350*/", $found );
+        $this->assertRegExp( "/DATE_FORMAT\( post_date, '0\.%i%s' \) = 0\.15350*/", $wpdb->remove_placeholder_escape( $found ) );
     }