<!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>[15580] trunk/wp-includes:
Use multiple JOINs instead of CASE in _wp_meta_sql().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15580">15580</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-09-06 11:04:50 +0000 (Mon, 06 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use multiple JOINs instead of CASE in _wp_meta_sql(). 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 (15579 => 15580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-09-06 08:09:41 UTC (rev 15579)
+++ trunk/wp-includes/functions.php 2010-09-06 11:04:50 UTC (rev 15580)
</span><span class="lines">@@ -4243,10 +4243,13 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $queries An array of queries
</span><del>- * @param string $meta_id_column The column that holds the object id
- * @return string
</del><ins>+ * @param string $primary_table
+ * @param string $primary_id_column
+ * @param string $meta_table
+ * @param string $meta_id_column
+ * @return array( $join_sql, $where_sql )
</ins><span class="cx"> */
</span><del>-function _wp_meta_sql( $queries, $meta_id_column ) {
</del><ins>+function _wp_meta_sql( $queries, $primary_table, $primary_id_column, $meta_table, $meta_id_column ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $clauses = array();
</span><span class="lines">@@ -4262,29 +4265,39 @@
</span><span class="cx"> if ( empty( $meta_key ) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- $clause = $wpdb->prepare( "WHEN %s THEN meta_value ", $meta_key );
-
</del><span class="cx"> if ( empty( $meta_value ) ) {
</span><del>- $clauses[] = $clause . "IS NOT NULL";
</del><ins>+ $clauses[ $meta_key ] = "";
</ins><span class="cx"> } elseif ( 'like' == $meta_compare ) {
</span><del>- $clauses[] = $clause . $wpdb->prepare( "LIKE %s", '%' . like_escape( $meta_value ) . '%' );
</del><ins>+ $clauses[ $meta_key ] = $wpdb->prepare( "LIKE %s", '%' . like_escape( $meta_value ) . '%' );
</ins><span class="cx"> } else {
</span><del>- $clauses[] = $clause . $wpdb->prepare( "$meta_compare %s", $meta_value );
</del><ins>+ $clauses[ $meta_key ] = $wpdb->prepare( "$meta_compare %s", $meta_value );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty( $clauses ) )
</span><del>- return '';
</del><ins>+ return array('', '');
</ins><span class="cx">
</span><del>- return "
- AND CASE meta_key
- " . implode( "\n", $clauses ) . "
- END
- GROUP BY $meta_id_column
- HAVING COUNT(*) = " . count( $clauses );
</del><ins>+ $join = '';
+ $where = '';
+
+ $i = 0;
+ foreach ( $clauses as $meta_key => $value_query ) {
+ $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)";
+
+ $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
+ if ( !empty( $value_query ) )
+ $where .= " AND $alias.meta_value $value_query";
+
+ $i++;
+ }
+
+ return array( $join, $where );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /*
</span><span class="cx"> * Used internally to tidy up the search terms
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15579 => 15580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-09-06 08:09:41 UTC (rev 15579)
+++ trunk/wp-includes/user.php 2010-09-06 11:04:50 UTC (rev 15580)
</span><span class="lines">@@ -463,13 +463,10 @@
</span><span class="cx">
</span><span class="cx"> $meta_queries[] = wp_array_slice_assoc( $qv, array( 'meta_key', 'meta_value', 'meta_compare' ) );
</span><span class="cx">
</span><del>- $meta_query_sql = _wp_meta_sql( $meta_queries, 'user_id' );
</del><ins>+ list( $meta_join, $meta_where ) = _wp_meta_sql( $meta_queries, $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
+ $this->query_from .= $meta_join;
+ $this->query_where .= $meta_where;
</ins><span class="cx">
</span><del>- if ( !empty( $meta_query_sql ) ) {
- $this->query_from .= " INNER JOIN $wpdb->usermeta ON ($wpdb->users.ID = $wpdb->usermeta.user_id)";
- $this->query_where .= $meta_query_sql;
- }
-
</del><span class="cx"> if ( !empty($qv['include']) ) {
</span><span class="cx"> $ids = implode( ',', wp_parse_id_list( $qv['include'] ) );
</span><span class="cx"> $this->query_where .= " AND $wpdb->users.ID IN ($ids)";
</span></span></pre>
</div>
</div>
</body>
</html>