<!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" />
<title>[28659] trunk: Fix SQL generation when `meta_query` has an `'relation' => 'OR'` for its queries and wants to `'orderby' => 'meta_value'`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28659">28659</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-04 05:47:19 +0000 (Wed, 04 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix SQL generation when `meta_query` has an `'relation' => 'OR'` for its queries and wants to `'orderby' => 'meta_value'`.
Adds unit test.
Props jackreichert.
Fixes <a href="http://core.trac.wordpress.org/ticket/25538">#25538</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunktestsphpunittestsmetaphp">trunk/tests/phpunit/tests/meta.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/meta.php (28658 => 28659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/meta.php 2014-06-04 05:34:37 UTC (rev 28658)
+++ trunk/src/wp-includes/meta.php 2014-06-04 05:47:19 UTC (rev 28659)
</span><span class="lines">@@ -972,6 +972,7 @@
</span><span class="cx"> $where["key-only-$key"] = $wpdb->prepare( "$meta_table.meta_key = %s", trim( $q['key'] ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $where_meta_key = array();
</ins><span class="cx"> foreach ( $queries as $k => $q ) {
</span><span class="cx"> $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
</span><span class="cx"> $meta_type = $this->get_cast_for_type( isset( $q['type'] ) ? $q['type'] : '' );
</span><span class="lines">@@ -1014,12 +1015,18 @@
</span><span class="cx"> $join[$i] .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
</span><span class="cx">
</span><span class="cx"> $where[$k] = '';
</span><del>- if ( !empty( $meta_key ) )
- $where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
</del><ins>+ if ( ! empty( $meta_key ) ) {
+ if ( isset( $q['compare'] ) ) {
+ $where_meta_key[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
+ } else {
+ $where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> if ( is_null( $meta_value ) ) {
</span><del>- if ( empty( $where[$k] ) )
</del><ins>+ if ( empty( $where[$k] ) && empty( $where_meta_key ) ) {
</ins><span class="cx"> unset( $join[$i] );
</span><ins>+ }
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1060,6 +1067,10 @@
</span><span class="cx"> else
</span><span class="cx"> $where = ' AND (' . implode( "\n{$this->relation} ", $where ) . ' )';
</span><span class="cx">
</span><ins>+ if ( ! empty( $where_meta_key ) ) {
+ $where .= "\nAND " . implode( "\nAND ", $where_meta_key );
+ }
+
</ins><span class="cx"> $join = implode( "\n", $join );
</span><span class="cx"> if ( ! empty( $join ) )
</span><span class="cx"> $join = ' ' . $join;
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/meta.php (28658 => 28659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/meta.php 2014-06-04 05:34:37 UTC (rev 28658)
+++ trunk/tests/phpunit/tests/meta.php 2014-06-04 05:47:19 UTC (rev 28659)
</span><span class="lines">@@ -197,4 +197,43 @@
</span><span class="cx"> wp_cache_delete( $post_id, 'post_meta' );
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ function test_query_meta_query_order() {
+ $post1 = $this->factory->post->create( array( 'post_title' => 'meta-value-1', 'post_date' => '2007-01-01 00:00:00' ) );
+ $post2 = $this->factory->post->create( array( 'post_title' => 'meta-value-2', 'post_date' => '2007-01-01 00:00:00' ) );
+ $post3 = $this->factory->post->create( array( 'post_title' => 'meta-value-3', 'post_date' => '2007-01-01 00:00:00' ) );
+
+ add_post_meta( $post1, 'order', 1 );
+ add_post_meta( $post2, 'order', 2 );
+ add_post_meta( $post3, 'order', 3 );
+
+ $args = array(
+ 'post_type' => 'post',
+ 'meta_key' => 'order',
+ 'meta_value' => 1,
+ 'meta_compare' => '>=',
+ 'orderby' => 'meta_value'
+ );
+
+ $args2 = array(
+ 'post_type' => 'post',
+ 'meta_key' => 'order',
+ 'meta_value' => 1,
+ 'meta_compare' => '>=',
+ 'orderby' => 'meta_value',
+ 'meta_query' => array(
+ 'relation' => 'OR',
+ array(
+ 'key' => 'order',
+ 'compare' => '>=',
+ 'value' => 1
+ )
+ )
+ );
+
+ $posts = get_posts( $args );
+ $posts2 = get_posts( $args2 );
+
+ $this->assertEquals( wp_list_pluck( $posts, 'post_title' ), wp_list_pluck( $posts2, 'post_title' ) );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>