<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29896] trunk: Support 'EXISTS' and 'NOT EXISTS' in `WP_Tax_Query`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/29896">29896</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/29896","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-15 00:53:22 +0000 (Wed, 15 Oct 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/29181">#29181</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunittestspostqueryphp">trunk/tests/phpunit/tests/post/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2014-10-14 19:57:13 UTC (rev 29895)
+++ trunk/src/wp-includes/taxonomy.php 2014-10-15 00:53:22 UTC (rev 29896)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,10 +691,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.1.0 Added support for $operator 'NOT EXISTS' and 'EXISTS'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $tax_query {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Array of taxonoy query clauses.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Array of taxonomy query clauses.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $relation Optional. The MySQL keyword used to join
</span><span class="cx" style="display: block; padding: 0 10px"> * the clauses of the query. Accepts 'AND', or 'OR'. Default 'AND'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,7 +707,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $field Field to match $terms against. Accepts 'term_id', 'slug',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'name', or 'term_taxonomy_id'. Default: 'term_id'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $operator MySQL operator to be used with $terms in the WHERE clause.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Accepts 'AND', 'IN', or 'OR. Default: 'IN'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Accepts 'AND', 'IN', 'NOT IN', 'EXISTS', 'NOT EXISTS'.
+ * Default: 'IN'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type bool $include_children Optional. Whether to include child terms.
</span><span class="cx" style="display: block; padding: 0 10px"> * Requires a $taxonomy. Default: true.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1026,6 +1028,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE term_taxonomy_id IN ($terms)
</span><span class="cx" style="display: block; padding: 0 10px"> AND object_id = $this->primary_table.$this->primary_id_column
</span><span class="cx" style="display: block; padding: 0 10px"> ) = $num_terms";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ } 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'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sql['join'][] = $join;
</span></span></pre></div>
<a id="trunktestsphpunittestspostqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/query.php 2014-10-14 19:57:13 UTC (rev 29895)
+++ trunk/tests/phpunit/tests/post/query.php 2014-10-15 00:53:22 UTC (rev 29896)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1413,6 +1413,134 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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 );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_tax_query_multiple_queries_relation_and() {
</span></span></pre>
</div>
</div>
</body>
</html>