Changeset 29933 for trunk/tests/phpunit/tests/date/query.php

Timestamp:

10/17/2014 01:19:03 AM (12 years ago)

Author:

boonebgorges

Message:

Use table aliases for columns in SQL generated by WP_Date_Query.

The use of non-aliased column names (eg 'post_date' instead of 'wp_posts.post_date')
in WP_Date_Query causes SQL notices and other failures when queries involve
table joins, such as date_query combined with tax_query or meta_query. This
changeset modifies WP_Date_Query::validate_column() to add the table alias when
it can be detected from the column name (ie, in the case of core columns).

A side effect of this change is that it is now possible to use WP_Date_Query
to build WHERE clauses across multiple tables, though there is currently no
core support for the automatic generation of the necessary JOIN clauses. See

Props ew_holmes, wonderboymusic, neoxx, Viper007Bond, boonebgorges.
Fixes #25775.

File:

• trunk/tests/phpunit/tests/date/query.php (modified) (2 diffs)

trunk/tests/phpunit/tests/date/query.php

@@ -202 +202 @@
 
         public function test_validate_column_post_date() {
-                $q = new WP_Date_Query( array() );
-
-                $this->assertSame( 'post_date', $q->validate_column( 'post_date' ) );
+                global $wpdb;
+                $q = new WP_Date_Query( array() );
+
+                $this->assertSame( $wpdb->posts . '.post_date', $q->validate_column( 'post_date' ) );
         }
 
         public function test_validate_column_post_date_gmt() {
-                $q = new WP_Date_Query( array() );
-
-                $this->assertSame( 'post_date_gmt', $q->validate_column( 'post_date_gmt' ) );
+                global $wpdb;
+                $q = new WP_Date_Query( array() );
+
+                $this->assertSame( $wpdb->posts . '.post_date_gmt', $q->validate_column( 'post_date_gmt' ) );
         }
 
         public function test_validate_column_post_modified() {
-                $q = new WP_Date_Query( array() );
-
-                $this->assertSame( 'post_modified', $q->validate_column( 'post_modified' ) );
+                global $wpdb;
+                $q = new WP_Date_Query( array() );
+
+                $this->assertSame( $wpdb->posts . '.post_modified', $q->validate_column( 'post_modified' ) );
         }
 
         public function test_validate_column_post_modified_gmt() {
-                $q = new WP_Date_Query( array() );
-
-                $this->assertSame( 'post_modified_gmt', $q->validate_column( 'post_modified_gmt' ) );
+                global $wpdb;
+                $q = new WP_Date_Query( array() );
+
+                $this->assertSame( $wpdb->posts . '.post_modified_gmt', $q->validate_column( 'post_modified_gmt' ) );
         }
 
         public function test_validate_column_comment_date() {
-                $q = new WP_Date_Query( array() );
-
-                $this->assertSame( 'comment_date', $q->validate_column( 'comment_date' ) );
+                global $wpdb;
+                $q = new WP_Date_Query( array() );
+
+                $this->assertSame( $wpdb->comments . '.comment_date', $q->validate_column( 'comment_date' ) );
         }
 
         public function test_validate_column_comment_date_gmt() {
-                $q = new WP_Date_Query( array() );
-
-                $this->assertSame( 'comment_date_gmt', $q->validate_column( 'comment_date_gmt' ) );
+                global $wpdb;
+                $q = new WP_Date_Query( array() );
+
+                $this->assertSame( $wpdb->comments . '.comment_date_gmt', $q->validate_column( 'comment_date_gmt' ) );
         }
 
         public function test_validate_column_invalid() {
-                $q = new WP_Date_Query( array() );
-
-                $this->assertSame( 'post_date', $q->validate_column( 'foo' ) );
+                global $wpdb;
+                $q = new WP_Date_Query( array() );
+
+                $this->assertSame( $wpdb->posts . '.post_date', $q->validate_column( 'foo' ) );
+        }
+
+        /**
+         * @ticket 25775
+         */
+        public function test_validate_column_with_date_query_valid_columns_filter() {
+                $q = new WP_Date_Query( array() );
+
+                add_filter( 'date_query_valid_columns', array( $this, 'date_query_valid_columns_callback' ) );
+
+                $this->assertSame( 'my_custom_column', $q->validate_column( 'my_custom_column' ) );
+
+                remove_filter( 'date_query_valid_columns', array( $this, 'date_query_valid_columns_callback' ) );
+        }
+
+        /**
+         * @ticket 25775
+         */
+        public function test_validate_column_prefixed_column_name() {
+                $q = new WP_Date_Query( array() );
+
+                $this->assertSame( 'foo.bar', $q->validate_column( 'foo.bar' ) );
+        }
+
+        /**
+         * @ticket 25775
+         */
+        public function test_validate_column_prefixed_column_name_with_illegal_characters() {
+                $q = new WP_Date_Query( array() );
+
+                $this->assertSame( 'foo.bar', $q->validate_column( 'f"\'oo\/.b;:()ar' ) );
         }
 
         public function test_build_value_value_null() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
@@ -903 +942 @@
                 }
         }
+
+        /** Helpers **********************************************************/
+
+        public function date_query_valid_columns_callback( $columns ) {
+                $columns[] = 'my_custom_column';
+                return $columns;
+        }
 }