<!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>[29855] trunk: Use the primary `meta_query` clause when parsing `orderby` in `WP_Query`.</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/29855">29855</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/29855","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kovshenin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-08 15:11:14 +0000 (Wed, 08 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'>Use the primary `meta_query` clause when parsing `orderby` in `WP_Query`.
When using legacy `meta_key`, `meta_value`, etc. arguments in `WP_Query`,
they're converted into the first clause of a `meta_query`. By using that
clause instead of the original arguments, we make sure that behavior is
consistent between the two available formats.
props boonebgorges.
fixes <a href="https://core.trac.wordpress.org/ticket/16814">#16814</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.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="trunksrcwpincludesqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2014-10-08 07:11:09 UTC (rev 29854)
+++ trunk/src/wp-includes/query.php 2014-10-08 15:11:14 UTC (rev 29855)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2223,9 +2223,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent', 'type', 'ID', 'menu_order', 'comment_count', 'rand',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta_key = $this->get( 'meta_key' );
- if ( ! empty( $meta_key ) ) {
- $allowed_keys[] = $meta_key;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $primary_meta_key = '';
+ $primary_meta_query = false;
+ if ( ! empty( $this->meta_query->queries ) ) {
+ $primary_meta_query = reset( $this->meta_query->queries );
+
+ if ( ! empty( $primary_meta_query['key'] ) ) {
+ $primary_meta_key = $primary_meta_query['key'];
+ $allowed_keys[] = $primary_meta_key;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_keys[] = 'meta_value';
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_keys[] = 'meta_value_num';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2250,12 +2257,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'rand':
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = 'RAND()';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case $meta_key:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case $primary_meta_key:
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'meta_value':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = $this->get( 'meta_type' );
- if ( ! empty( $type ) ) {
- $meta_type = $this->meta_query->get_cast_for_type( $type );
- $orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $primary_meta_query['type'] ) ) {
+ $sql_type = $this->meta_query->get_cast_for_type( $primary_meta_query['type'] );
+ $orderby = "CAST($wpdb->postmeta.meta_value AS {$sql_type})";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "$wpdb->postmeta.meta_value";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta.php 2014-10-08 07:11:09 UTC (rev 29854)
+++ trunk/tests/phpunit/tests/meta.php 2014-10-08 15:11:14 UTC (rev 29855)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,11 +162,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected2, get_metadata( 'user', $this->author->ID, $key, true ) );
</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">+ /**
+ * @ticket 16814
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_meta_type_cast() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id1 = $this->factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id1, 'num_as_longtext', 123 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_post_meta( $post_id1, 'num_as_longtext_desc', 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id2 = $this->factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id2, 'num_as_longtext', 99 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_post_meta( $post_id2, 'num_as_longtext_desc', 100 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = new WP_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,6 +186,47 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $post_id2, $post_id1 ), $posts->posts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, substr_count( $posts->request, 'CAST(' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Make sure the newer meta_query syntax behaves in a consistent way
+ $posts = new WP_Query( array(
+ 'fields' => 'ids',
+ 'post_type' => 'any',
+ 'meta_query' => array(
+ array(
+ 'key' => 'num_as_longtext',
+ 'value' => '0',
+ 'compare' => '>',
+ 'type' => 'UNSIGNED',
+ ),
+ ),
+ 'orderby' => 'meta_value',
+ 'order' => 'ASC'
+ ) );
+
+ $this->assertEquals( array( $post_id2, $post_id1 ), $posts->posts );
+ $this->assertEquals( 2, substr_count( $posts->request, 'CAST(' ) );
+
+ // The legacy `meta_key` value should take precedence.
+ $posts = new WP_Query( array(
+ 'fields' => 'ids',
+ 'post_type' => 'any',
+ 'meta_key' => 'num_as_longtext',
+ 'meta_compare' => '>',
+ 'meta_type' => 'UNSIGNED',
+ 'meta_query' => array(
+ array(
+ 'key' => 'num_as_longtext_desc',
+ 'value' => '0',
+ 'compare' => '>',
+ 'type' => 'UNSIGNED',
+ ),
+ ),
+ 'orderby' => 'meta_value',
+ 'order' => 'ASC'
+ ) );
+
+ $this->assertEquals( array( $post_id2, $post_id1 ), $posts->posts );
+ $this->assertEquals( 2, substr_count( $posts->request, 'CAST(' ) );
</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"> function test_meta_cache_order_asc() {
</span></span></pre>
</div>
</div>
</body>
</html>