Changeset 16849

Timestamp:

12/09/2010 07:29:21 PM (14 years ago)

Author:

scribu

Message:

Introduce WP_Tax_Query. Fix canonical redirects in the process. See #15752

Location:

trunk/wp-includes

Files:

• canonical.php (modified) (1 diff)
• query.php (modified) (6 diffs)
• taxonomy.php (modified) (1 diff)

trunk/wp-includes/canonical.php

@@ -147 +147 @@
 
             $term_count = 0;
-            foreach ( $wp_query->tax_query as $tax_query )
+            foreach ( $wp_query->tax_query->queries as $tax_query )
                 $term_count += count( $tax_query['terms'] );
 

trunk/wp-includes/query.php

@@ -715 +715 @@
      * @since 3.1.0
      * @access public
-     * @var array
-     */
-    var $tax_query = array();
+     * @var object WP_Tax_Query
+     */
+    var $tax_query;
 
     /**
@@ -1585 +1585 @@
         }
 
-        _set_tax_query_defaults( $tax_query );
-
-        foreach ( $tax_query as $query ) {
-            if ( ! is_array( $query ) )
-                continue;
-
+        $tax_query_obj = new WP_Tax_Query( $tax_query );
+
+        foreach ( $tax_query_obj->queries as $query ) {
             if ( 'IN' == $query['operator'] ) {
                 switch ( $query['taxonomy'] ) {
@@ -1605 +1602 @@
         }
 
-        return $tax_query;
+        return $tax_query_obj;
     }
 
@@ -1943 +1940 @@
             $this->tax_query = $this->parse_tax_query( $q );
 
-            $clauses = call_user_func_array( 'get_tax_sql', array( $this->tax_query, $wpdb->posts, 'ID', &$this) );
+            $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
 
             $join .= $clauses['join'];
@@ -1958 +1955 @@
 
             // Back-compat
-            $tax_query_in = wp_list_filter( $this->tax_query, array( 'operator' => 'IN' ) );
+            $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
             if ( !empty( $tax_query_in ) ) {
                 if ( !isset( $q['taxonomy'] ) ) {
@@ -2658 +2655 @@
         $this->queried_object_id = 0;
 
-        $tax_query_in = wp_list_filter( $this->tax_query, array( 'operator' => 'IN' ) );
+        $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
         if ( !empty( $tax_query_in ) ) {
             $query = reset( $tax_query_in );

trunk/wp-includes/taxonomy.php

@@ -528 +528 @@
  */
 function get_tax_sql( $tax_query, $primary_table, $primary_id_column ) {
-    global $wpdb;
-
-    $join = '';
-    $where = array();
-    $i = 0;
-
-    _set_tax_query_defaults( $tax_query );
-
-    if ( strtoupper( $tax_query['relation'] ) == 'OR' ) {
-        $relation = 'OR';
-    } else {
-        $relation = 'AND';
-    }
-
-    foreach ( $tax_query as $query ) {
-        if ( ! is_array( $query ) )
-            continue;
-
-        extract( $query );
-
-        if ( ! taxonomy_exists( $taxonomy ) )
-            return array( 'join' => '', 'where' => ' AND 0 = 1');
-
-        $terms = array_unique( (array) $terms );
-
-        if ( empty( $terms ) )
-            continue;
-
-        if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
-            _transform_terms( $terms, $taxonomy, $field, 'term_id' );
-
-            $children = array();
-            foreach ( $terms as $term ) {
-                $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
-                $children[] = $term;
-            }
-            $terms = $children;
-
-            _transform_terms( $terms, $taxonomy, 'term_id', 'term_taxonomy_id' );
-        }
-        else {
-            _transform_terms( $terms, $taxonomy, $field, 'term_taxonomy_id' );
-        }
-
-        if ( 'IN' == $operator ) {
-
-            if ( empty( $terms ) ) {
-                if ( 'OR' == $relation )
-                    continue;
-                else
-                    return array( 'join' => '', 'where' => ' AND 0 = 1' );
-            }
-
-            $terms = implode( ',', $terms );
-
-            $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
-
-            $join .= " INNER JOIN $wpdb->term_relationships";
-            $join .= $i ? " AS $alias" : '';
-            $join .= " ON ($primary_table.$primary_id_column = $alias.object_id)";
-
-            $where[] = "$alias.term_taxonomy_id $operator ($terms)";
-        }
-        elseif ( 'NOT IN' == $operator ) {
+    $tax_query_obj = new WP_Tax_Query( $tax_query );
+    return $tax_query_obj->get_sql( $primary_table, $primary_id_column );
+}
+
+class WP_Tax_Query {
+    var $relation = '';
+    var $queries = array();
+
+    function __construct( &$tax_query ) {
+        if ( isset( $tax_query['relation'] ) && strtoupper( $tax_query['relation'] ) == 'OR' ) {
+            $this->relation = 'OR';
+        } else {
+            $this->relation = 'AND';
+        }
+
+        $defaults = array(
+            'taxonomy' => '',
+            'terms' => array(),
+            'include_children' => true,
+            'field' => 'term_id',
+            'operator' => 'IN',
+        );
+
+        foreach ( $tax_query as $query ) {
+            if ( ! is_array( $query ) )
+                continue;
+
+            $query = array_merge( $defaults, $query );
+
+            $query['terms'] = (array) $query['terms'];
+            
+            $this->queries[] = $query;
+        }
+    }
+
+    function get_sql( $primary_table, $primary_id_column ) {
+        global $wpdb;
+
+        $join = '';
+        $where = array();
+        $i = 0;
+
+        foreach ( $this->queries as $query ) {
+            extract( $query );
+
+            if ( ! taxonomy_exists( $taxonomy ) )
+                return array( 'join' => '', 'where' => ' AND 0 = 1');
+
+            $terms = array_unique( (array) $terms );
 
             if ( empty( $terms ) )
                 continue;
 
-            $terms = implode( ',', $terms );
-
-            $where[] = "$primary_table.$primary_id_column NOT IN (
-                SELECT object_id
-                FROM $wpdb->term_relationships
-                WHERE term_taxonomy_id IN ($terms)
-            )";
-        }
-
-        $i++;
-    }
-
-    if ( !empty( $where ) )
-        $where = ' AND ( ' . implode( " $relation ", $where ) . ' )';
-    else
-        $where = '';
-
-    return compact( 'join', 'where' );
-}
-
-function _set_tax_query_defaults( &$tax_query ) {
-    if ( ! isset( $tax_query['relation'] ) )
-        $tax_query['relation'] = 'AND';
-
-    $defaults = array(
-        'taxonomy' => '',
-        'terms' => array(),
-        'include_children' => true,
-        'field' => 'term_id',
-        'operator' => 'IN',
-    );
-
-    foreach ( $tax_query as $i => $query ) {
-        if ( ! is_array( $query ) )
-            continue;
-
-        $tax_query[$i] = array_merge( $defaults, $query );
-
-        $tax_query[$i]['terms'] = (array) $tax_query[$i]['terms'];
-    }
-}
-
-function _transform_terms( &$terms, $taxonomy, $field, $resulting_field ) {
-    global $wpdb;
-
-    if ( empty( $terms ) )
-        return;
-
-    if ( $field == $resulting_field )
-        return;
-
-    $resulting_field = esc_sql( $resulting_field );
-
-    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;
-
-        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)
-            " );
+            if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
+                $this->_transform_terms( $terms, $taxonomy, $field, 'term_id' );
+
+                $children = array();
+                foreach ( $terms as $term ) {
+                    $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
+                    $children[] = $term;
+                }
+                $terms = $children;
+
+                $this->_transform_terms( $terms, $taxonomy, 'term_id', 'term_taxonomy_id' );
+            }
+            else {
+                $this->_transform_terms( $terms, $taxonomy, $field, 'term_taxonomy_id' );
+            }
+
+            if ( 'IN' == $operator ) {
+
+                if ( empty( $terms ) ) {
+                    if ( 'OR' == $relation )
+                        continue;
+                    else
+                        return array( 'join' => '', 'where' => ' AND 0 = 1' );
+                }
+
+                $terms = implode( ',', $terms );
+
+                $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
+
+                $join .= " INNER JOIN $wpdb->term_relationships";
+                $join .= $i ? " AS $alias" : '';
+                $join .= " ON ($primary_table.$primary_id_column = $alias.object_id)";
+
+                $where[] = "$alias.term_taxonomy_id $operator ($terms)";
+            }
+            elseif ( 'NOT IN' == $operator ) {
+
+                if ( empty( $terms ) )
+                    continue;
+
+                $terms = implode( ',', $terms );
+
+                $where[] = "$primary_table.$primary_id_column NOT IN (
+                    SELECT object_id
+                    FROM $wpdb->term_relationships
+                    WHERE term_taxonomy_id IN ($terms)
+                )";
+            }
+
+            $i++;
+        }
+
+        if ( !empty( $where ) )
+            $where = ' AND ( ' . implode( " $relation ", $where ) . ' )';
+        else
+            $where = '';
+
+        return compact( 'join', 'where' );
+    }
+
+    function _transform_terms( &$terms, $taxonomy, $field, $resulting_field ) {
+        global $wpdb;
+
+        if ( empty( $terms ) )
+            return;
+
+        if ( $field == $resulting_field )
+            return;
+
+        $resulting_field = esc_sql( $resulting_field );
+
+        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;
+
+            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)
+                " );
+        }
     }
 }