Changeset 29933 for trunk/tests/phpunit/tests/query/dateQuery.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/query/dateQuery.php (modified) (3 diffs)

trunk/tests/phpunit/tests/query/dateQuery.php

@@ -611 +611 @@
 
         public function test_date_params_monthnum_m_duplicate() {
+                global $wpdb;
+
                 $this->create_posts();
 
@@ -630 +632 @@
                 $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
 
-                $this->assertContains( "MONTH( post_date ) = 5", $this->q->request );
-                $this->assertNotContains( "MONTH( post_date ) = 9", $this->q->request );
+                $this->assertContains( "MONTH( $wpdb->posts.post_date ) = 5", $this->q->request );
+                $this->assertNotContains( "MONTH( $wpdb->posts.post_date ) = 9", $this->q->request );
         }
 
         public function test_date_params_week_w_duplicate() {
+                global $wpdb;
+
                 $this->create_posts();
 
@@ -653 +657 @@
                 $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
 
-                $this->assertContains( "WEEK( post_date, 1 ) = 21", $this->q->request );
-                $this->assertNotContains( "WEEK( post_date, 1 ) = 22", $this->q->request );
+                $this->assertContains( "WEEK( $wpdb->posts.post_date, 1 ) = 21", $this->q->request );
+                $this->assertNotContains( "WEEK( $wpdb->posts.post_date, 1 ) = 22", $this->q->request );
+        }
+
+        /**
+         * @ticket 25775
+         */
+        public function test_date_query_with_taxonomy_join() {
+                $p1 = $this->factory->post->create( array(
+                        'post_date' => '2013-04-27 01:01:01',
+                ) );
+                $p2 = $this->factory->post->create( array(
+                        'post_date' => '2013-03-21 01:01:01',
+                ) );
+
+                register_taxonomy( 'foo', 'post' );
+                wp_set_object_terms( $p1, 'bar', 'foo' );
+
+                $posts = $this->_get_query_result( array(
+                        'date_query' => array(
+                                'year' => 2013,
+                        ),
+                        'tax_query' => array(
+                                array(
+                                        'taxonomy' => 'foo',
+                                        'terms' => array( 'bar' ),
+                                        'field' => 'name',
+                                ),
+                        ),
+                ) );
+
+                _unregister_taxonomy( 'foo' );
+
+                $this->assertEquals( array( $p1 ), wp_list_pluck( $posts, 'ID' ) );
         }