<!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>[26053] trunk: Respect the `compare` operator value in `meta_query` when `value` evaluates to `null`.</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/26053">26053</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-11-08 22:51:03 +0000 (Fri, 08 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Respect the `compare` operator value in `meta_query` when `value` evaluates to `null`. Adds Unit Test.
Props bradyvercher, gradyetc.
Fixes <a href="http://core.trac.wordpress.org/ticket/22967">#22967</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/meta.php (26052 => 26053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/meta.php 2013-11-08 22:37:41 UTC (rev 26052)
+++ trunk/src/wp-includes/meta.php 2013-11-08 22:51:03 UTC (rev 26053)
</span><span class="lines">@@ -753,7 +753,7 @@
</span><span class="cx"> // Split out the meta_key only queries (we can only do this for OR)
</span><span class="cx"> if ( 'OR' == $this->relation ) {
</span><span class="cx"> foreach ( $this->queries as $k => $q ) {
</span><del>- if ( ! isset( $q['value'] ) && ! empty( $q['key'] ) )
</del><ins>+ if ( ! array_key_exists( 'value', $q ) && ! empty( $q['key'] ) )
</ins><span class="cx"> $key_only_queries[$k] = $q;
</span><span class="cx"> else
</span><span class="cx"> $queries[$k] = $q;
</span><span class="lines">@@ -774,6 +774,9 @@
</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="cx">
</span><ins>+ if ( array_key_exists( 'value', $q ) && is_null( $q['value'] ) )
+ $q['value'] = '';
+
</ins><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="trunktestsphpunittestsmetaqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/meta/query.php (26052 => 26053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/meta/query.php 2013-11-08 22:37:41 UTC (rev 26052)
+++ trunk/tests/phpunit/tests/meta/query.php 2013-11-08 22:51:03 UTC (rev 26053)
</span><span class="lines">@@ -105,4 +105,18 @@
</span><span class="cx"> $this->assertEquals( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_key = 'my_third_key'" ) );
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ticket 22967
+ */
+ function test_null_value_sql() {
+ global $wpdb;
+
+ $query = new WP_Meta_Query( array(
+ array( 'key' => 'abc', 'value' => null, 'compare' => '=' )
+ ) );
+ $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
+
+ $this->assertEquals( 1, substr_count( $sql['where'], "CAST($wpdb->postmeta.meta_value AS CHAR) = '')" ) );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>