Changeset 15715

Timestamp:

10/04/2010 06:57:13 PM (14 years ago)

Author:

scribu

Message:

Introduce WP_Object_Query. See #15032

Location:

trunk/wp-includes

Files:

• classes.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• query.php (modified) (4 diffs)
• user.php (modified) (3 diffs)

trunk/wp-includes/classes.php

@@ -526 +526 @@
 
 /**
+ * WordPress Query class.
+ *
+ * Abstract class for handling advanced queries
+ *
+ * @package WordPress
+ * @since 3.1.0
+ */
+class WP_Object_Query {
+
+    /**
+     * Metadata query
+     *
+     * @since 3.1.0
+     * @access public
+     * @var array
+     */
+    var $meta_query = array();
+
+    /*
+     * Populates the $meta_query property
+     *
+     * @access private
+     * @since 3.1.0
+     *
+     * @param array $qv The query variables
+     */
+    function parse_meta_query( $qv ) {
+        if ( !empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
+            $this->meta_query = $qv['meta_query'];
+        }
+
+        $meta_query = array();
+        foreach ( array( 'key', 'value', 'compare' ) as $key ) {
+            if ( !empty( $qv[ "meta_$key" ] ) )
+                $meta_query[ $key ] = $qv[ "meta_$key" ];
+        }
+
+        if ( !empty( $meta_query ) ) {
+            $this->meta_query[] = $meta_query;
+        }
+    }
+
+    /*
+     * Used internally to generate an SQL string for searching across multiple meta key = value pairs
+     *
+     * @access private
+     * @since 3.1.0
+     *
+     * @param string $primary_table
+     * @param string $primary_id_column
+     * @param string $meta_table
+     * @param string $meta_id_column
+     * @return array( $join_sql, $where_sql )
+     */
+    function get_meta_sql( $primary_table, $primary_id_column, $meta_table, $meta_id_column ) {
+        global $wpdb;
+
+        $clauses = array();
+
+        $join = '';
+        $where = '';
+        $i = 0;
+        foreach ( $this->meta_query as $q ) {
+            $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
+            $meta_value = isset( $q['value'] ) ? trim( $q['value'] ) : '';
+            $meta_compare = isset( $q['compare'] ) ? $q['compare'] : '=';
+
+            if ( !in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'like' ) ) )
+                $meta_compare = '=';
+
+            if ( empty( $meta_key ) && empty( $meta_value ) )
+                continue;
+
+            $alias = $i ? 'mt' . $i : $meta_table;
+
+            $join .= "\nINNER JOIN $meta_table";
+            $join .= $i ? " AS $alias" : '';
+            $join .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
+
+            $i++;
+
+            if ( !empty( $meta_key ) )
+                $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
+
+            if ( empty( $meta_value ) )
+                continue;
+
+            if ( 'like' == $meta_compare ) {
+                $where .= $wpdb->prepare( " AND $alias.meta_value LIKE %s", '%' . like_escape( $meta_value ) . '%' );
+            } else {
+                $where .= $wpdb->prepare( " AND $alias.meta_value $meta_compare %s", $meta_value );
+            }
+        }
+
+        return array( $join, $where );
+    }
+}
+
+/**
  * WordPress Error class.
  *

trunk/wp-includes/functions.php

@@ -4258 +4258 @@
 
 /*
- * Used internally to generate an SQL string for searching across multiple meta key = value pairs
- *
- * @access private
- * @since 3.1.0
- *
- * @param array $queries An array of queries
- * @param string $primary_table
- * @param string $primary_id_column
- * @param string $meta_table
- * @param string $meta_id_column
- * @return array( $join_sql, $where_sql )
- */
-function _wp_meta_sql( $queries, $primary_table, $primary_id_column, $meta_table, $meta_id_column ) {
-    global $wpdb;
-
-    $clauses = array();
-
-    $join = '';
-    $where = '';
-    $i = 0;
-    foreach ( $queries as $q ) {
-        $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
-        $meta_value = isset( $q['value'] ) ? trim( $q['value'] ) : '';
-        $meta_compare = isset( $q['compare'] ) ? $q['compare'] : '=';
-
-        if ( !in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'like' ) ) )
-            $meta_compare = '=';
-
-        if ( empty( $meta_key ) && empty( $meta_value ) )
-            continue;
-
-        $alias = $i ? 'mt' . $i : $meta_table;
-
-        $join .= "\nINNER JOIN $meta_table";
-        $join .= $i ? " AS $alias" : '';
-        $join .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
-
-        $i++;
-
-        if ( !empty( $meta_key ) )
-            $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
-
-        if ( empty( $meta_value ) )
-            continue;
-
-        if ( 'like' == $meta_compare ) {
-            $where .= $wpdb->prepare( " AND $alias.meta_value LIKE %s", '%' . like_escape( $meta_value ) . '%' );
-        } else {
-            $where .= $wpdb->prepare( " AND $alias.meta_value $meta_compare %s", $meta_value );
-        }
-    }
-
-    return array( $join, $where );
-}
-
-/*
  * Used internally to tidy up the search terms
  *

trunk/wp-includes/query.php

@@ -642 +642 @@
  * @since 1.5.0
  */
-class WP_Query {
+class WP_Query extends WP_Object_Query {
 
     /**
@@ -670 +670 @@
      */
     var $tax_query = array();
-
-    /**
-     * Metadata query
-     *
-     * @since 3.1.0
-     * @access public
-     * @var array
-     */
-    var $meta_query = array();
 
     /**
@@ -1390 +1381 @@
             }
 
-            if ( !empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
-                $this->meta_query = $qv['meta_query'];
-            }
-
-            $meta_query = array();
-            foreach ( array( 'key', 'value', 'compare' ) as $key ) {
-                if ( !empty( $qv[ "meta_$key" ] ) )
-                    $meta_query[ $key ] = $qv[ "meta_$key" ];
-            }
-
-            if ( !empty( $meta_query ) ) {
-                $this->meta_query[] = $meta_query;
-            }
+            $this->parse_meta_query( $qv );
 
             if ( empty($qv['author']) || ($qv['author'] == '0') ) {
@@ -2212 +2191 @@
         }
 
-        list( $meta_join, $meta_where ) = _wp_meta_sql( $this->meta_query, $wpdb->posts, 'ID', $wpdb->postmeta, 'post_id' );
+        list( $meta_join, $meta_where ) = $this->get_meta_sql( $wpdb->posts, 'ID', $wpdb->postmeta, 'post_id' );
         $join .= $meta_join;
         $where .= $meta_where;

trunk/wp-includes/user.php

@@ -331 +331 @@
  * @since 3.1.0
  */
-class WP_User_Query {
+class WP_User_Query extends WP_Object_Query {
 
     /**
@@ -445 +445 @@
         }
 
+        $this->parse_meta_query( $qv );
+
         $role = trim( $qv['role'] );
         $blog_id = absint( $qv['blog_id'] );
-
-        $meta_queries = array();
 
         if ( $blog_id ) {
@@ -459 +459 @@
             }
 
-            $meta_queries[] = $cap_meta_query;
-        }
-
-        $meta_query = array();
-        foreach ( array( 'key', 'value', 'compare' ) as $key ) {
-            if ( !empty( $qv[ "meta_$key" ] ) )
-                $meta_query[ $key ] = $qv[ "meta_$key" ];
-        }
-
-        if ( !empty( $meta_query ) ) {
-            $meta_queries[] = $meta_query;
-        }
-
-        list( $meta_join, $meta_where ) = _wp_meta_sql( $meta_queries, $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
+            $this->meta_query[] = $cap_meta_query;
+        }
+
+        list( $meta_join, $meta_where ) = $this->get_meta_sql( $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
         $this->query_from .= $meta_join;
         $this->query_where .= $meta_where;