<!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>[15730] trunk/wp-includes/classes.php: further meta query optimization.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15730">15730</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-05 23:06:20 +0000 (Tue, 05 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>further meta query optimization. props aaroncampbell. fixes <a href="http://trac.wordpress.org/ticket/9124">#9124</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (15729 => 15730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-10-05 22:42:47 UTC (rev 15729)
+++ trunk/wp-includes/classes.php 2010-10-05 23:06:20 UTC (rev 15730)
</span><span class="lines">@@ -552,17 +552,17 @@
</span><span class="cx"> * @param array $qv The query variables
</span><span class="cx"> */
</span><span class="cx"> function parse_meta_query( $qv ) {
</span><del>- if ( !empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
</del><ins>+ if ( ! empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
</ins><span class="cx"> $this->meta_query = $qv['meta_query'];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $meta_query = array();
</span><del>- foreach ( array( 'key', 'value', 'compare' ) as $key ) {
- if ( !empty( $qv[ "meta_$key" ] ) )
</del><ins>+ foreach ( array( 'key', 'value', 'compare', 'type' ) as $key ) {
+ if ( ! empty( $qv[ "meta_$key" ] ) )
</ins><span class="cx"> $meta_query[ $key ] = $qv[ "meta_$key" ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $meta_query ) ) {
</del><ins>+ if ( ! empty( $meta_query ) ) {
</ins><span class="cx"> array_unshift( $this->meta_query, $meta_query );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -593,14 +593,12 @@
</span><span class="cx"> $meta_compare = isset( $q['compare'] ) ? strtoupper( $q['compare'] ) : '=';
</span><span class="cx"> $meta_type = isset( $q['type'] ) ? strtoupper( $q['type'] ) : 'CHAR';
</span><span class="cx">
</span><del>- if ( !in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'IN', 'BETWEEN' ) ) )
</del><ins>+ if ( ! in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'IN', 'BETWEEN' ) ) )
</ins><span class="cx"> $meta_compare = '=';
</span><span class="cx">
</span><del>- if ( 'STRING' == $meta_type )
- $meta_type = 'CHAR';
- elseif ( 'NUMERIC' == $meta_type )
</del><ins>+ if ( 'NUMERIC' == $meta_type )
</ins><span class="cx"> $meta_type = 'SIGNED';
</span><del>- elseif ( !in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED' ) ) )
</del><ins>+ elseif ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED' ) ) )
</ins><span class="cx"> $meta_type = 'CHAR';
</span><span class="cx">
</span><span class="cx"> if ( empty( $meta_key ) && empty( $meta_value ) )
</span><span class="lines">@@ -618,7 +616,7 @@
</span><span class="cx"> $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
</span><span class="cx">
</span><span class="cx"> if ( in_array( $meta_compare, array( 'IN', 'BETWEEN' ) ) ) {
</span><del>- if ( !is_array( $meta_value ) )
</del><ins>+ if ( ! is_array( $meta_value ) )
</ins><span class="cx"> $meta_value = preg_split( '/[,\s]+/', $meta_value );
</span><span class="cx"> } else {
</span><span class="cx"> $meta_value = trim( $meta_value );
</span></span></pre>
</div>
</div>
</body>
</html>