<!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>[15565] trunk/wp-includes: introduce _wp_meta_sql().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15565">15565</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-09-05 13:31:33 +0000 (Sun, 05 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>introduce _wp_meta_sql(). Preparation for adding blog_id to WP_User_Query. See <a href="http://trac.wordpress.org/ticket/14572">#14572</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15564 => 15565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-09-05 02:45:39 UTC (rev 15564)
+++ trunk/wp-includes/functions.php 2010-09-05 13:31:33 UTC (rev 15565)
</span><span class="lines">@@ -4219,6 +4219,56 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><ins>+ * 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
+ * @return string
+ */
+function _wp_meta_sql( $queries, $meta_id_column, $table ) {
+ global $wpdb;
+
+ $clauses = array();
+
+ foreach ( $queries as $query ) {
+ $meta_key = trim( @$query['meta_key'] );
+ $meta_value = trim( @$query['meta_value'] );
+ $meta_compare = @$query['meta_compare'];
+
+ if ( empty( $meta_compare ) || !in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'like' ) ) )
+ $meta_compare = '=';
+
+ if ( empty( $meta_key ) )
+ continue;
+
+ $clause = $wpdb->prepare( "WHEN %s THEN meta_value ", $meta_key );
+
+ if ( empty( $meta_value ) ) {
+ $clauses[] = $clause . "IS NOT NULL";
+ } elseif ( 'like' == $meta_compare ) {
+ $clauses[] = $clause . $wpdb->prepare( "LIKE %s", '%' . like_escape( $meta_value ) . '%' );
+ } else {
+ $clauses[] = $clause . $wpdb->prepare( "$meta_compare %s", $meta_value );
+ }
+ }
+
+ if ( empty( $clauses ) )
+ return '';
+
+ return "
+ SELECT $meta_id_column
+ FROM $table
+ WHERE CASE meta_key
+ " . implode( "\n", $clauses ) . "
+ END
+ GROUP BY $meta_id_column
+ HAVING COUNT(*) = " . count( $clauses );
+}
+
+
+/*
</ins><span class="cx"> * Used internally to tidy up the search terms
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15564 => 15565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-09-05 02:45:39 UTC (rev 15564)
+++ trunk/wp-includes/user.php 2010-09-05 13:31:33 UTC (rev 15565)
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> 'orderby' => 'login', 'order' => 'ASC',
</span><span class="cx"> 'meta_key' => '', 'meta_value' => '',
</span><span class="cx"> 'include' => array(), 'exclude' => array(),
</span><del>- 'fields' => 'all'
</del><ins>+ 'fields' => 'all',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $this->prepare_query();
</span><span class="lines">@@ -445,26 +445,31 @@
</span><span class="cx">
</span><span class="cx"> $role = trim( $qv['role'] );
</span><span class="cx">
</span><del>- if ( $role || is_multisite() ) {
- $this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
- $this->query_where .= $wpdb->prepare( " AND $wpdb->usermeta.meta_key = %s", $wpdb->prefix . 'capabilities' );
- }
</del><ins>+ $meta_queries = array();
</ins><span class="cx">
</span><ins>+ $cap_meta_query = array();
+ $cap_meta_key = $wpdb->prefix . 'capabilities';
+
+ if ( $role || is_multisite() )
+ $cap_meta_query['meta_key'] = $cap_meta_key;
+
</ins><span class="cx"> if ( $role ) {
</span><del>- $this->query_where .= $wpdb->prepare( " AND $wpdb->usermeta.meta_value LIKE %s", '%' . like_escape( $role ) . '%' );
</del><ins>+ $cap_meta_query['meta_value'] = $role;
+ $cap_meta_query['meta_compare'] = 'like';
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $meta_key = trim( $qv['meta_key'] );
- $meta_value = trim( $qv['meta_value'] );
- if ( $meta_key ) {
- if ( empty( $meta_value ) ) {
- $subquery = $wpdb->prepare( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = %s", $meta_key );
- }
- else {
- $subquery = $wpdb->prepare( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = %s AND meta_value = %s", $meta_key, $meta_value );
- }
</del><ins>+ $meta_queries[] = $cap_meta_query;
</ins><span class="cx">
</span><del>- $this->query_where .= " AND $wpdb->users.ID IN ($subquery)";
</del><ins>+ $meta_queries[] = array(
+ 'meta_key' => @$qv['meta_key'],
+ 'meta_value' => @$qv['meta_key'],
+ 'meta_compare' => @$qv['meta_key'],
+ );
+
+ $meta_query_sql = _wp_meta_sql( $meta_queries, 'user_id', $wpdb->usermeta );
+
+ if ( !empty( $meta_query_sql ) ) {
+ $this->query_where .= " AND $wpdb->users.ID IN ($meta_query_sql)";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($qv['include']) ) {
</span></span></pre>
</div>
</div>
</body>
</html>