<!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>[25255] trunk: When `meta_type` is passed with `orderby => meta_value`, `orderby` must also use `CAST()` to avoid scenarios like: `SELECT`ing by `UNSIGNED` and then ordering by `CHAR`.</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/25255">25255</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-05 16:56:36 +0000 (Thu, 05 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>When `meta_type` is passed with `orderby => meta_value`, `orderby` must also use `CAST()` to avoid scenarios like: `SELECT`ing by `UNSIGNED` and then ordering by `CHAR`. Adds unit test.
Fixes <a href="http://core.trac.wordpress.org/ticket/21621">#21621</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<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="trunksrcwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/meta.php (25254 => 25255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/meta.php 2013-09-05 16:33:50 UTC (rev 25254)
+++ trunk/src/wp-includes/meta.php 2013-09-05 16:56:36 UTC (rev 25255)
</span><span class="lines">@@ -604,6 +604,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Given a meta type, return the appropriate alias if applicable
+ *
+ * @since 3.7.0
+ *
+ * @see WP_Meta_Query
+ *
+ * @param string $type MySQL type to cast meta_value
+ * @return string MySQL type
+ */
+function get_meta_type( $type = '' ) {
+ if ( empty( $type ) )
+ return 'CHAR';
+
+ $meta_type = strtoupper( $type );
+
+ if ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED', 'NUMERIC' ) ) )
+ return 'CHAR';
+
+ if ( 'NUMERIC' == $meta_type )
+ $meta_type = 'SIGNED';
+
+ return $meta_type;
+}
+/**
</ins><span class="cx"> * Container class for a multiple metadata query
</span><span class="cx"> *
</span><span class="cx"> * @since 3.2.0
</span><span class="lines">@@ -744,13 +768,8 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $queries as $k => $q ) {
</span><span class="cx"> $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
</span><del>- $meta_type = isset( $q['type'] ) ? strtoupper( $q['type'] ) : 'CHAR';
</del><ins>+ $meta_type = get_meta_type( isset( $q['type'] ) ? $q['type'] : '' );
</ins><span class="cx">
</span><del>- if ( 'NUMERIC' == $meta_type )
- $meta_type = 'SIGNED';
- elseif ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED' ) ) )
- $meta_type = 'CHAR';
-
</del><span class="cx"> $meta_value = isset( $q['value'] ) ? $q['value'] : null;
</span><span class="cx">
</span><span class="cx"> if ( isset( $q['compare'] ) )
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (25254 => 25255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2013-09-05 16:33:50 UTC (rev 25254)
+++ trunk/src/wp-includes/query.php 2013-09-05 16:56:36 UTC (rev 25255)
</span><span class="lines">@@ -2420,7 +2420,12 @@
</span><span class="cx"> break;
</span><span class="cx"> case $q['meta_key']:
</span><span class="cx"> case 'meta_value':
</span><del>- $orderby = "$wpdb->postmeta.meta_value";
</del><ins>+ if ( isset( $q['meta_type'] ) ) {
+ $meta_type = get_meta_type( $q['meta_type'] );
+ $orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})";
+ } else {
+ $orderby = "$wpdb->postmeta.meta_value";
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case 'meta_value_num':
</span><span class="cx"> $orderby = "$wpdb->postmeta.meta_value+0";
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/meta.php (25254 => 25255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/meta.php 2013-09-05 16:33:50 UTC (rev 25254)
+++ trunk/tests/phpunit/tests/meta.php 2013-09-05 16:56:36 UTC (rev 25255)
</span><span class="lines">@@ -150,4 +150,25 @@
</span><span class="cx"> $this->assertInternalType( 'int', update_metadata( 'user', $this->author->ID, $key, $value2 ) );
</span><span class="cx"> $this->assertEquals( $expected2, get_metadata( 'user', $this->author->ID, $key, true ) );
</span><span class="cx"> }
</span><ins>+
+ function test_meta_type_cast() {
+ $post_id1 = $this->factory->post->create();
+ add_post_meta( $post_id1, 'num_as_longtext', 123 );
+ $post_id2 = $this->factory->post->create();
+ add_post_meta( $post_id2, 'num_as_longtext', 99 );
+
+ $posts = new WP_Query( array(
+ 'fields' => 'ids',
+ 'post_type' => 'any',
+ 'meta_key' => 'num_as_longtext',
+ 'meta_value' => '0',
+ 'meta_compare' => '>',
+ 'meta_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"> }
</span></span></pre>
</div>
</div>
</body>
</html>