<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16849] trunk/wp-includes: Introduce WP_Tax_Query.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16849">16849</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-12-09 19:29:21 +0000 (Thu, 09 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce WP_Tax_Query. Fix canonical redirects in the process. See <a href="http://trac.wordpress.org/ticket/15752">#15752</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (16848 => 16849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-12-09 19:29:00 UTC (rev 16848)
+++ trunk/wp-includes/canonical.php 2010-12-09 19:29:21 UTC (rev 16849)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> } elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)
</span><span class="cx">
</span><span class="cx"> $term_count = 0;
</span><del>- foreach ( $wp_query->tax_query as $tax_query )
</del><ins>+ foreach ( $wp_query->tax_query->queries as $tax_query )
</ins><span class="cx"> $term_count += count( $tax_query['terms'] );
</span><span class="cx">
</span><span class="cx"> $obj = $wp_query->get_queried_object();
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16848 => 16849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-12-09 19:29:00 UTC (rev 16848)
+++ trunk/wp-includes/query.php 2010-12-09 19:29:21 UTC (rev 16849)
</span><span class="lines">@@ -714,9 +714,9 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access public
</span><del>- * @var array
</del><ins>+ * @var object WP_Tax_Query
</ins><span class="cx"> */
</span><del>- var $tax_query = array();
</del><ins>+ var $tax_query;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the data for a single object that is queried.
</span><span class="lines">@@ -1584,12 +1584,9 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _set_tax_query_defaults( $tax_query );
</del><ins>+ $tax_query_obj = new WP_Tax_Query( $tax_query );
</ins><span class="cx">
</span><del>- foreach ( $tax_query as $query ) {
- if ( ! is_array( $query ) )
- continue;
-
</del><ins>+ foreach ( $tax_query_obj->queries as $query ) {
</ins><span class="cx"> if ( 'IN' == $query['operator'] ) {
</span><span class="cx"> switch ( $query['taxonomy'] ) {
</span><span class="cx"> case 'category':
</span><span class="lines">@@ -1604,7 +1601,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return $tax_query;
</del><ins>+ return $tax_query_obj;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1942,7 +1939,7 @@
</span><span class="cx"> if ( $this->is_category || $this->is_tag || $this->is_tax ) {
</span><span class="cx"> $this->tax_query = $this->parse_tax_query( $q );
</span><span class="cx">
</span><del>- $clauses = call_user_func_array( 'get_tax_sql', array( $this->tax_query, $wpdb->posts, 'ID', &$this) );
</del><ins>+ $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
</ins><span class="cx">
</span><span class="cx"> $join .= $clauses['join'];
</span><span class="cx"> $where .= $clauses['where'];
</span><span class="lines">@@ -1957,7 +1954,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Back-compat
</span><del>- $tax_query_in = wp_list_filter( $this->tax_query, array( 'operator' => 'IN' ) );
</del><ins>+ $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
</ins><span class="cx"> if ( !empty( $tax_query_in ) ) {
</span><span class="cx"> if ( !isset( $q['taxonomy'] ) ) {
</span><span class="cx"> foreach ( $tax_query_in as $a_tax_query ) {
</span><span class="lines">@@ -2657,7 +2654,7 @@
</span><span class="cx"> $this->queried_object = NULL;
</span><span class="cx"> $this->queried_object_id = 0;
</span><span class="cx">
</span><del>- $tax_query_in = wp_list_filter( $this->tax_query, array( 'operator' => 'IN' ) );
</del><ins>+ $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
</ins><span class="cx"> if ( !empty( $tax_query_in ) ) {
</span><span class="cx"> $query = reset( $tax_query_in );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16848 => 16849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-12-09 19:29:00 UTC (rev 16848)
+++ trunk/wp-includes/taxonomy.php 2010-12-09 19:29:21 UTC (rev 16849)
</span><span class="lines">@@ -527,148 +527,152 @@
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function get_tax_sql( $tax_query, $primary_table, $primary_id_column ) {
</span><del>- global $wpdb;
</del><ins>+ $tax_query_obj = new WP_Tax_Query( $tax_query );
+ return $tax_query_obj->get_sql( $primary_table, $primary_id_column );
+}
</ins><span class="cx">
</span><del>- $join = '';
- $where = array();
- $i = 0;
</del><ins>+class WP_Tax_Query {
+ var $relation = '';
+ var $queries = array();
</ins><span class="cx">
</span><del>- _set_tax_query_defaults( $tax_query );
</del><ins>+ function __construct( &$tax_query ) {
+ if ( isset( $tax_query['relation'] ) && strtoupper( $tax_query['relation'] ) == 'OR' ) {
+ $this->relation = 'OR';
+ } else {
+ $this->relation = 'AND';
+ }
</ins><span class="cx">
</span><del>- if ( strtoupper( $tax_query['relation'] ) == 'OR' ) {
- $relation = 'OR';
- } else {
- $relation = 'AND';
- }
</del><ins>+ $defaults = array(
+ 'taxonomy' => '',
+ 'terms' => array(),
+ 'include_children' => true,
+ 'field' => 'term_id',
+ 'operator' => 'IN',
+ );
</ins><span class="cx">
</span><del>- foreach ( $tax_query as $query ) {
- if ( ! is_array( $query ) )
- continue;
</del><ins>+ foreach ( $tax_query as $query ) {
+ if ( ! is_array( $query ) )
+ continue;
</ins><span class="cx">
</span><del>- extract( $query );
</del><ins>+ $query = array_merge( $defaults, $query );
</ins><span class="cx">
</span><del>- if ( ! taxonomy_exists( $taxonomy ) )
- return array( 'join' => '', 'where' => ' AND 0 = 1');
</del><ins>+ $query['terms'] = (array) $query['terms'];
+
+ $this->queries[] = $query;
+ }
+ }
</ins><span class="cx">
</span><del>- $terms = array_unique( (array) $terms );
</del><ins>+ function get_sql( $primary_table, $primary_id_column ) {
+ global $wpdb;
</ins><span class="cx">
</span><del>- if ( empty( $terms ) )
- continue;
</del><ins>+ $join = '';
+ $where = array();
+ $i = 0;
</ins><span class="cx">
</span><del>- if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
- _transform_terms( $terms, $taxonomy, $field, 'term_id' );
</del><ins>+ foreach ( $this->queries as $query ) {
+ extract( $query );
</ins><span class="cx">
</span><del>- $children = array();
- foreach ( $terms as $term ) {
- $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
- $children[] = $term;
- }
- $terms = $children;
</del><ins>+ if ( ! taxonomy_exists( $taxonomy ) )
+ return array( 'join' => '', 'where' => ' AND 0 = 1');
</ins><span class="cx">
</span><del>- _transform_terms( $terms, $taxonomy, 'term_id', 'term_taxonomy_id' );
- }
- else {
- _transform_terms( $terms, $taxonomy, $field, 'term_taxonomy_id' );
- }
</del><ins>+ $terms = array_unique( (array) $terms );
</ins><span class="cx">
</span><del>- if ( 'IN' == $operator ) {
</del><ins>+ if ( empty( $terms ) )
+ continue;
</ins><span class="cx">
</span><del>- if ( empty( $terms ) ) {
- if ( 'OR' == $relation )
- continue;
- else
- return array( 'join' => '', 'where' => ' AND 0 = 1' );
- }
</del><ins>+ if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
+ $this->_transform_terms( $terms, $taxonomy, $field, 'term_id' );
</ins><span class="cx">
</span><del>- $terms = implode( ',', $terms );
</del><ins>+ $children = array();
+ foreach ( $terms as $term ) {
+ $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
+ $children[] = $term;
+ }
+ $terms = $children;
</ins><span class="cx">
</span><del>- $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
</del><ins>+ $this->_transform_terms( $terms, $taxonomy, 'term_id', 'term_taxonomy_id' );
+ }
+ else {
+ $this->_transform_terms( $terms, $taxonomy, $field, 'term_taxonomy_id' );
+ }
</ins><span class="cx">
</span><del>- $join .= " INNER JOIN $wpdb->term_relationships";
- $join .= $i ? " AS $alias" : '';
- $join .= " ON ($primary_table.$primary_id_column = $alias.object_id)";
</del><ins>+ if ( 'IN' == $operator ) {
</ins><span class="cx">
</span><del>- $where[] = "$alias.term_taxonomy_id $operator ($terms)";
- }
- elseif ( 'NOT IN' == $operator ) {
</del><ins>+ if ( empty( $terms ) ) {
+ if ( 'OR' == $relation )
+ continue;
+ else
+ return array( 'join' => '', 'where' => ' AND 0 = 1' );
+ }
</ins><span class="cx">
</span><del>- if ( empty( $terms ) )
- continue;
</del><ins>+ $terms = implode( ',', $terms );
</ins><span class="cx">
</span><del>- $terms = implode( ',', $terms );
</del><ins>+ $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
</ins><span class="cx">
</span><del>- $where[] = "$primary_table.$primary_id_column NOT IN (
- SELECT object_id
- FROM $wpdb->term_relationships
- WHERE term_taxonomy_id IN ($terms)
- )";
- }
</del><ins>+ $join .= " INNER JOIN $wpdb->term_relationships";
+ $join .= $i ? " AS $alias" : '';
+ $join .= " ON ($primary_table.$primary_id_column = $alias.object_id)";
</ins><span class="cx">
</span><del>- $i++;
- }
</del><ins>+ $where[] = "$alias.term_taxonomy_id $operator ($terms)";
+ }
+ elseif ( 'NOT IN' == $operator ) {
</ins><span class="cx">
</span><del>- if ( !empty( $where ) )
- $where = ' AND ( ' . implode( " $relation ", $where ) . ' )';
- else
- $where = '';
</del><ins>+ if ( empty( $terms ) )
+ continue;
</ins><span class="cx">
</span><del>- return compact( 'join', 'where' );
-}
</del><ins>+ $terms = implode( ',', $terms );
</ins><span class="cx">
</span><del>-function _set_tax_query_defaults( &$tax_query ) {
- if ( ! isset( $tax_query['relation'] ) )
- $tax_query['relation'] = 'AND';
</del><ins>+ $where[] = "$primary_table.$primary_id_column NOT IN (
+ SELECT object_id
+ FROM $wpdb->term_relationships
+ WHERE term_taxonomy_id IN ($terms)
+ )";
+ }
</ins><span class="cx">
</span><del>- $defaults = array(
- 'taxonomy' => '',
- 'terms' => array(),
- 'include_children' => true,
- 'field' => 'term_id',
- 'operator' => 'IN',
- );
</del><ins>+ $i++;
+ }
</ins><span class="cx">
</span><del>- foreach ( $tax_query as $i => $query ) {
- if ( ! is_array( $query ) )
- continue;
</del><ins>+ if ( !empty( $where ) )
+ $where = ' AND ( ' . implode( " $relation ", $where ) . ' )';
+ else
+ $where = '';
</ins><span class="cx">
</span><del>- $tax_query[$i] = array_merge( $defaults, $query );
-
- $tax_query[$i]['terms'] = (array) $tax_query[$i]['terms'];
</del><ins>+ return compact( 'join', 'where' );
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-function _transform_terms( &$terms, $taxonomy, $field, $resulting_field ) {
- global $wpdb;
</del><ins>+ function _transform_terms( &$terms, $taxonomy, $field, $resulting_field ) {
+ global $wpdb;
</ins><span class="cx">
</span><del>- if ( empty( $terms ) )
- return;
</del><ins>+ if ( empty( $terms ) )
+ return;
</ins><span class="cx">
</span><del>- if ( $field == $resulting_field )
- return;
</del><ins>+ if ( $field == $resulting_field )
+ return;
</ins><span class="cx">
</span><del>- $resulting_field = esc_sql( $resulting_field );
</del><ins>+ $resulting_field = esc_sql( $resulting_field );
</ins><span class="cx">
</span><del>- switch ( $field ) {
- case 'slug':
- case 'name':
- $terms = "'" . implode( "','", array_map( 'sanitize_title_for_query', $terms ) ) . "'";
- $terms = $wpdb->get_col( "
- SELECT $wpdb->term_taxonomy.$resulting_field
- FROM $wpdb->term_taxonomy
- INNER JOIN $wpdb->terms USING (term_id)
- WHERE taxonomy = '$taxonomy'
- AND $wpdb->terms.$field IN ($terms)
- " );
- break;
</del><ins>+ switch ( $field ) {
+ case 'slug':
+ case 'name':
+ $terms = "'" . implode( "','", array_map( 'sanitize_title_for_query', $terms ) ) . "'";
+ $terms = $wpdb->get_col( "
+ SELECT $wpdb->term_taxonomy.$resulting_field
+ FROM $wpdb->term_taxonomy
+ INNER JOIN $wpdb->terms USING (term_id)
+ WHERE taxonomy = '$taxonomy'
+ AND $wpdb->terms.$field IN ($terms)
+ " );
+ break;
</ins><span class="cx">
</span><del>- default:
- $terms = implode( ',', array_map( 'intval', $terms ) );
- $terms = $wpdb->get_col( "
- SELECT $resulting_field
- FROM $wpdb->term_taxonomy
- WHERE taxonomy = '$taxonomy'
- AND term_id IN ($terms)
- " );
</del><ins>+ default:
+ $terms = implode( ',', array_map( 'intval', $terms ) );
+ $terms = $wpdb->get_col( "
+ SELECT $resulting_field
+ FROM $wpdb->term_taxonomy
+ WHERE taxonomy = '$taxonomy'
+ AND term_id IN ($terms)
+ " );
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>