Changeset 29896

Timestamp:

10/15/2014 12:53:22 AM (10 years ago)

Author:

boonebgorges

Message:

Support 'EXISTS' and 'NOT EXISTS' in WP_Tax_Query.

These new values for the 'operator' parameter make it possible to filter items
that have no term from a given taxonomy, or any term from a given taxonomy.

Includes unit tests.

Fixes #29181.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (3 diffs)
• tests/phpunit/tests/post/query.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -692 +692 @@
      *
      * @since 3.1.0
+     * @since 4.1.0 Added support for $operator 'NOT EXISTS' and 'EXISTS'.
      * @access public
      *
      * @param array $tax_query {
-     *     Array of taxonoy query clauses.
+     *     Array of taxonomy query clauses.
      *
      *     @type string $relation Optional. The MySQL keyword used to join
@@ -707 +708 @@
      *                                                 'name', or 'term_taxonomy_id'. Default: 'term_id'.
      *         @type string           $operator         MySQL operator to be used with $terms in the WHERE clause.
-     *                                                  Accepts 'AND', 'IN', or 'OR. Default: 'IN'.
+     *                                                  Accepts 'AND', 'IN', 'NOT IN', 'EXISTS', 'NOT EXISTS'.
+     *                                                  Default: 'IN'.
      *         @type bool             $include_children Optional. Whether to include child terms.
      *                                                  Requires a $taxonomy. Default: true.
@@ -1027 +1029 @@
                 AND object_id = $this->primary_table.$this->primary_id_column
             ) = $num_terms";
+
+        } elseif ( 'NOT EXISTS' === $operator || 'EXISTS' === $operator ) {
+
+            $where = $wpdb->prepare( "$operator (
+                SELECT 1
+                FROM $wpdb->term_relationships
+                INNER JOIN $wpdb->term_taxonomy
+                ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
+                WHERE $wpdb->term_taxonomy.taxonomy = %s
+                AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
+            )", $clause['taxonomy'] );
+
         }
 

trunk/tests/phpunit/tests/post/query.php

@@ -1414 +1414 @@
 
     /**
+     * @ticket 29181
+     */
+    public function test_tax_query_operator_not_exists() {
+        register_taxonomy( 'wptests_tax1', 'post' );
+        register_taxonomy( 'wptests_tax2', 'post' );
+
+        $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+        $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+
+        $p1 = $this->factory->post->create();
+        $p2 = $this->factory->post->create();
+        $p3 = $this->factory->post->create();
+
+        wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
+        wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
+
+        $q = new WP_Query( array(
+            'fields' => 'ids',
+            'orderby' => 'ID',
+            'order' => 'ASC',
+            'tax_query' => array(
+                array(
+                    'taxonomy' => 'wptests_tax2',
+                    'operator' => 'NOT EXISTS',
+                ),
+            ),
+        ) );
+
+        $this->assertEqualSets( array( $p1, $p3 ), $q->posts );
+    }
+
+    /**
+     * @ticket 29181
+     */
+    public function test_tax_query_operator_exists() {
+        register_taxonomy( 'wptests_tax1', 'post' );
+        register_taxonomy( 'wptests_tax2', 'post' );
+
+        $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+        $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+
+        $p1 = $this->factory->post->create();
+        $p2 = $this->factory->post->create();
+        $p3 = $this->factory->post->create();
+
+        wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
+        wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
+
+        $q = new WP_Query( array(
+            'fields' => 'ids',
+            'orderby' => 'ID',
+            'order' => 'ASC',
+            'tax_query' => array(
+                array(
+                    'taxonomy' => 'wptests_tax2',
+                    'operator' => 'EXISTS',
+                ),
+            ),
+        ) );
+
+        $this->assertEqualSets( array( $p2 ), $q->posts );
+    }
+
+    /**
+     * @ticket 29181
+     */
+    public function test_tax_query_operator_exists_should_ignore_terms() {
+        register_taxonomy( 'wptests_tax1', 'post' );
+        register_taxonomy( 'wptests_tax2', 'post' );
+
+        $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+        $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+
+        $p1 = $this->factory->post->create();
+        $p2 = $this->factory->post->create();
+        $p3 = $this->factory->post->create();
+
+        wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
+        wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
+
+        $q = new WP_Query( array(
+            'fields' => 'ids',
+            'orderby' => 'ID',
+            'order' => 'ASC',
+            'tax_query' => array(
+                array(
+                    'taxonomy' => 'wptests_tax2',
+                    'operator' => 'EXISTS',
+                    'terms' => array( 'foo', 'bar' ),
+                ),
+            ),
+        ) );
+
+        $this->assertEqualSets( array( $p2 ), $q->posts );
+    }
+
+    /**
+     * @ticket 29181
+     */
+    public function test_tax_query_operator_exists_with_no_taxonomy() {
+        register_taxonomy( 'wptests_tax1', 'post' );
+        register_taxonomy( 'wptests_tax2', 'post' );
+
+        $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+        $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+
+        $p1 = $this->factory->post->create();
+        $p2 = $this->factory->post->create();
+        $p3 = $this->factory->post->create();
+
+        wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
+        wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
+
+        $q = new WP_Query( array(
+            'fields' => 'ids',
+            'orderby' => 'ID',
+            'order' => 'ASC',
+            'tax_query' => array(
+                array(
+                    'operator' => 'EXISTS',
+                ),
+            ),
+        ) );
+
+        $this->assertEmpty( $q->posts );
+    }
+
+    /**
      * @group taxonomy
      */