Ticket #25775: 25775.2.patch

src/wp-includes/date.php

@@ -165 +165 @@
          * @return string A validated column name value.
          */
         public function validate_column( $column ) {
+                global $wpdb;
+
                 $valid_columns = array(
                         'post_date', 'post_date_gmt', 'post_modified',
                         'post_modified_gmt', 'comment_date', 'comment_date_gmt'
                 );
-                /**
-                 * Filter the list of valid date query columns.
-                 *
-                 * @since 3.7.0
-                 *
-                 * @param array $valid_columns An array of valid date query columns. Defaults are 'post_date', 'post_date_gmt',
-                 *                             'post_modified', 'post_modified_gmt', 'comment_date', 'comment_date_gmt'
-                 */
-                if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ) ) )
-                        $column = 'post_date';
 
-                return $column;
+                // Attempt to detect a table prefix.
+                if ( false === strpos( $column, '.' ) ) {
+                        /**
+                         * Filter the list of valid date query columns.
+                         *
+                         * @since 3.7.0
+                         *
+                         * @param array $valid_columns An array of valid date query columns. Defaults
+                         *                             are 'post_date', 'post_date_gmt', 'post_modified',
+                         *                             'post_modified_gmt', 'comment_date', 'comment_date_gmt'
+                         */
+                        if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ) ) ) {
+                                $column = 'post_date';
+                        }
+
+                        $known_columns = array(
+                                $wpdb->posts => array(
+                                        'post_date',
+                                        'post_date_gmt',
+                                        'post_modified',
+                                        'post_modified_gmt',
+                                ),
+                                $wpdb->comments => array(
+                                        'comment_date',
+                                        'comment_date_gmt',
+                                ),
+                        );
+
+                        foreach ( $known_columns as $table_name => $table_columns ) {
+                                if ( in_array( $column, $table_columns ) ) {
+                                        $column = $table_name . '.' . $column;
+                                        break;
+                                }
+                        }
+
+                }
+
+                return esc_sql( $column );
         }
 
         /**

tests/phpunit/tests/date/query.php

@@ -182 +182 @@
         }
 
         public function test_validate_column_post_date() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
-                $this->assertSame( 'post_date', $q->validate_column( 'post_date' ) );
+                $this->assertSame( $wpdb->posts . '.post_date', $q->validate_column( 'post_date' ) );
         }
 
         public function test_validate_column_post_date_gmt() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
-                $this->assertSame( 'post_date_gmt', $q->validate_column( 'post_date_gmt' ) );
+                $this->assertSame( $wpdb->posts . '.post_date_gmt', $q->validate_column( 'post_date_gmt' ) );
         }
 
         public function test_validate_column_post_modified() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
-                $this->assertSame( 'post_modified', $q->validate_column( 'post_modified' ) );
+                $this->assertSame( $wpdb->posts . '.post_modified', $q->validate_column( 'post_modified' ) );
         }
 
         public function test_validate_column_post_modified_gmt() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
-                $this->assertSame( 'post_modified_gmt', $q->validate_column( 'post_modified_gmt' ) );
+                $this->assertSame( $wpdb->posts . '.post_modified_gmt', $q->validate_column( 'post_modified_gmt' ) );
         }
 
         public function test_validate_column_comment_date() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
-                $this->assertSame( 'comment_date', $q->validate_column( 'comment_date' ) );
+                $this->assertSame( $wpdb->comments . '.comment_date', $q->validate_column( 'comment_date' ) );
         }
 
         public function test_validate_column_comment_date_gmt() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
-                $this->assertSame( 'comment_date_gmt', $q->validate_column( 'comment_date_gmt' ) );
+                $this->assertSame( $wpdb->comments . '.comment_date_gmt', $q->validate_column( 'comment_date_gmt' ) );
         }
 
         public function test_validate_column_invalid() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
-                $this->assertSame( 'post_date', $q->validate_column( 'foo' ) );
+                $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' ) );
         }
 
         public function test_build_value_value_null() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
                 $this->assertFalse( $q->build_value( 'foo', null ) );
@@ -571 +601 @@
                 // varying precision on different PHP installations
                 $this->assertRegExp( "/DATE_FORMAT\( post_date, '0\.%i%s' \) = 0\.15350*/", $found );
         }
+
+        /** Helpers **********************************************************/
+
+        public function date_query_valid_columns_callback( $columns ) {
+                $columns[] = 'my_custom_column';
+                return $columns;
+        }
 }

tests/phpunit/tests/query/dateQuery.php

@@ -590 +590 @@
         }
 
         public function test_date_params_monthnum_m_duplicate() {
+                global $wpdb;
+
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
                                 'month' => 5,
@@ -607 +609 @@
 
                 $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
 
-                $this->assertContains( "AND ( ( MONTH( post_date ) = 5 ) ) AND", $this->q->request );
+                $this->assertContains( "AND ( ( MONTH( $wpdb->posts.post_date ) = 5 ) ) AND", $this->q->request );
 
-                $this->assertNotContains( "AND ( ( MONTH( post_date ) = 5 AND MONTH( post_date ) = 9 ) ) AND", $this->q->request );
+                $this->assertNotContains( "AND ( ( MONTH( $wpdb->posts.post_date ) = 5 AND MONTH( $wpdb->posts.post_date ) = 9 ) ) AND", $this->q->request );
         }
 
         public function test_date_params_week_w_duplicate() {
+                global $wpdb;
+
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
                                 'week' => 21,
@@ -629 +633 @@
 
                 $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
 
-                $this->assertContains( "AND ( ( WEEK( post_date, 1 ) = 21 ) ) AND", $this->q->request );
+                $this->assertContains( "AND ( ( WEEK( $wpdb->posts.post_date, 1 ) = 21 ) ) AND", $this->q->request );
+
+                $this->assertNotContains( "AND ( ( WEEK( $wpdb->posts.post_date, 1 ) = 21 AND WEEK( $wpdb->posts.post_date, 1 ) = 22 ) ) AND", $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->assertNotContains( "AND ( ( WEEK( post_date, 1 ) = 21 AND WEEK( post_date, 1 ) = 22 ) ) AND", $this->q->request );
+                $this->assertEquals( array( $p1 ), wp_list_pluck( $posts, 'ID' ) );
         }
-}
- No newline at end of file
+}