Changeset 37184

Timestamp:

04/12/2016 08:36:31 PM (10 years ago)

Author:

boonebgorges

Message:

Use LEFT JOIN when building WP_Tax_Query SQL.

LEFT JOIN ensures that NOT EXISTS queries will not miss posts that have
no taxonomy data whatsoever.

Props swissspidy, crstauf.
Fixes #36343.

Location:

trunk

Files:

• src/wp-includes/class-wp-tax-query.php (modified) (1 diff)
• tests/phpunit/tests/query/taxQuery.php (modified) (1 diff)

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

@@ -441 +441 @@
                 $clause['alias'] = $alias;
 
-                $join .= " INNER JOIN $wpdb->term_relationships";
+                $join .= " LEFT JOIN $wpdb->term_relationships";
                 $join .= $i ? " AS $alias" : '';
                 $join .= " ON ($this->primary_table.$this->primary_id_column = $alias.object_id)";

trunk/tests/phpunit/tests/query/taxQuery.php

@@ -408 +408 @@
 
         $this->assertEqualSets( array( $p1, $p3 ), $q->posts );
+    }
+
+    /**
+     * @ticket 36343
+     */
+    public function test_tax_query_operator_not_exists_combined() {
+        register_post_type( 'wptests_cpt1' );
+        register_taxonomy( 'wptests_tax1', 'wptests_cpt1' );
+        register_taxonomy( 'wptests_tax2', 'wptests_cpt1' );
+
+        $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+        $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+        $t3 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+
+        $p1 = self::factory()->post->create( array( 'post_type' => 'wptests_cpt1' ) );
+        $p2 = self::factory()->post->create( array( 'post_type' => 'wptests_cpt1' ) );
+        $p3 = self::factory()->post->create( array( 'post_type' => 'wptests_cpt1' ) );
+        $p4 = self::factory()->post->create( array( 'post_type' => 'wptests_cpt1' ) );
+
+        wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
+        wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax1' );
+        wp_set_object_terms( $p3, array( $t3 ), 'wptests_tax2' );
+
+        $q = new WP_Query( array(
+            'post_type' => 'wptests_cpt1',
+            'fields'    => 'ids',
+            'tax_query' => array(
+                'relation' => 'OR',
+                array(
+                    'taxonomy' => 'wptests_tax1',
+                    'operator' => 'NOT EXISTS',
+                ),
+                array(
+                    'taxonomy' => 'wptests_tax1',
+                    'field'    => 'slug',
+                    'terms'    => get_term_field( 'slug', $t1 ),
+                ),
+            ),
+        ) );
+
+        unregister_post_type( 'wptests_cpt1' );
+        unregister_taxonomy( 'wptests_tax1' );
+        unregister_taxonomy( 'wptests_tax2' );
+
+        $this->assertEqualSets( array( $p1, $p3, $p4 ), $q->posts );
     }