<!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>[29964] trunk: Make orderby=meta_value compatible with meta_query when relation=OR.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/29964">29964</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/29964","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-19 18:53:55 +0000 (Sun, 19 Oct 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Make orderby=meta_value compatible with meta_query when relation=OR.
Passing orderby=meta_value and meta_key=foo to WP_Query should require that
each matched post have a meta value with the key 'foo'. To make this
requirement compatible with meta_query params that have the relation OR, we
nest the meta_query param, and join it using AND to a meta_query clause
generated from the meta_key/meta_compare/meta_type query vars.
Fixes <a href="https://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="#trunktestsphpunittestsmetaqueryphp">trunk/tests/phpunit/tests/meta/query.php</a></li>
<li><a href="#trunktestsphpunittestspostqueryphp">trunk/tests/phpunit/tests/post/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/meta.php 2014-10-19 09:12:11 UTC (rev 29963)
+++ trunk/src/wp-includes/meta.php 2014-10-19 18:53:55 UTC (rev 29964)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1057,18 +1057,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function parse_query_vars( $qv ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_query = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Simple query needs to be first for orderby=meta_value to work correctly.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * For orderby=meta_value to work correctly, simple query needs to be
+ * first (so that its table join is against an unaliased meta table) and
+ * needs to be its own clause (so it doesn't interfere with the logic of
+ * the rest of the meta_query).
+ */
+ $primary_meta_query = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'key', 'compare', 'type' ) as $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $qv[ "meta_$key" ] ) )
- $meta_query[0][ $key ] = $qv[ "meta_$key" ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $qv[ "meta_$key" ] ) ) {
+ $primary_meta_query[ $key ] = $qv[ "meta_$key" ];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // WP_Query sets 'meta_value' = '' by default.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $qv[ 'meta_value' ] ) && '' !== $qv[ 'meta_value' ] && ( ! is_array( $qv[ 'meta_value' ] ) || $qv[ 'meta_value' ] ) )
- $meta_query[0]['value'] = $qv[ 'meta_value' ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $qv['meta_value'] ) && '' !== $qv['meta_value'] && ( ! is_array( $qv['meta_value'] ) || $qv['meta_value'] ) ) {
+ $primary_meta_query['value'] = $qv['meta_value'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
- $meta_query = array_merge( $meta_query, $qv['meta_query'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $existing_meta_query = isset( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ? $qv['meta_query'] : array();
+
+ if ( ! empty( $primary_meta_query ) && ! empty( $existing_meta_query ) ) {
+ $meta_query = array(
+ 'relation' => 'AND',
+ $primary_meta_query,
+ $existing_meta_query,
+ );
+ } else if ( ! empty( $primary_meta_query ) ) {
+ $meta_query = array(
+ $primary_meta_query,
+ );
+ } else if ( ! empty( $existing_meta_query ) ) {
+ $meta_query = $existing_meta_query;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->__construct( $meta_query );
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/meta/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta/query.php 2014-10-19 09:12:11 UTC (rev 29963)
+++ trunk/tests/phpunit/tests/meta/query.php 2014-10-19 18:53:55 UTC (rev 29964)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,9 +104,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected0, $query->queries[0] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected1 = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => 'foo1',
- 'compare' => 'baz1',
- 'value' => 'bar1',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'relation' => 'OR',
+ array(
+ 'key' => 'foo1',
+ 'compare' => 'baz1',
+ 'value' => 'bar1',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected1, $query->queries[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspostqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/query.php 2014-10-19 09:12:11 UTC (rev 29963)
+++ trunk/tests/phpunit/tests/post/query.php 2014-10-19 18:53:55 UTC (rev 29964)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1188,6 +1188,90 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group meta
+ * @ticket 29604
+ */
+ public function test_meta_query_with_orderby_meta_value_relation_or() {
+ $posts = $this->factory->post->create_many( 4 );
+ update_post_meta( $posts[0], 'foo', 5 );
+ update_post_meta( $posts[1], 'foo', 6 );
+ update_post_meta( $posts[2], 'foo', 4 );
+ update_post_meta( $posts[3], 'foo', 7 );
+
+ update_post_meta( $posts[0], 'bar1', 'baz' );
+ update_post_meta( $posts[1], 'bar1', 'baz' );
+ update_post_meta( $posts[2], 'bar2', 'baz' );
+
+ $query = new WP_Query( array(
+ 'orderby' => 'meta_value',
+ 'order' => 'ASC',
+ 'meta_key' => 'foo',
+ 'meta_query' => array(
+ 'relation' => 'OR',
+ array(
+ 'key' => 'bar1',
+ 'value' => 'baz',
+ 'compare' => '=',
+ ),
+ array(
+ 'key' => 'bar2',
+ 'value' => 'baz',
+ 'compare' => '=',
+ ),
+ ),
+ 'update_post_meta_cache' => false,
+ 'update_post_term_cache' => false,
+ 'fields' => 'ids',
+ ) );
+
+ $this->assertEquals( array( $posts[2], $posts[0], $posts[1] ), $query->posts );
+ }
+
+ /**
+ * @group meta
+ * @ticket 29604
+ */
+ public function test_meta_query_with_orderby_meta_value_relation_and() {
+ $posts = $this->factory->post->create_many( 4 );
+ update_post_meta( $posts[0], 'foo', 5 );
+ update_post_meta( $posts[1], 'foo', 6 );
+ update_post_meta( $posts[2], 'foo', 4 );
+ update_post_meta( $posts[3], 'foo', 7 );
+
+ update_post_meta( $posts[0], 'bar1', 'baz' );
+ update_post_meta( $posts[1], 'bar1', 'baz' );
+ update_post_meta( $posts[2], 'bar1', 'baz' );
+ update_post_meta( $posts[3], 'bar1', 'baz' );
+ update_post_meta( $posts[0], 'bar2', 'baz' );
+ update_post_meta( $posts[1], 'bar2', 'baz' );
+ update_post_meta( $posts[2], 'bar2', 'baz' );
+
+ $query = new WP_Query( array(
+ 'orderby' => 'meta_value',
+ 'order' => 'ASC',
+ 'meta_key' => 'foo',
+ 'meta_query' => array(
+ 'relation' => 'AND',
+ array(
+ 'key' => 'bar1',
+ 'value' => 'baz',
+ 'compare' => '=',
+ ),
+ array(
+ 'key' => 'bar2',
+ 'value' => 'baz',
+ 'compare' => '=',
+ ),
+ ),
+ 'update_post_meta_cache' => false,
+ 'update_post_term_cache' => false,
+ 'fields' => 'ids',
+ ) );
+
+ $this->assertEquals( array( $posts[2], $posts[0], $posts[1] ), $query->posts );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29642
</span><span class="cx" style="display: block; padding: 0 10px"> * @group meta
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>