<!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>[BuddyPress][11018] trunk: In `BP_XProfile_Query`, fix variable name typo that prevented table JOINs from shared between meta query clauses.</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="http://buddypress.trac.wordpress.org/changeset/11018">11018</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11018","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>2016-08-19 17:42:41 +0000 (Fri, 19 Aug 2016)</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'>In `BP_XProfile_Query`, fix variable name typo that prevented table JOINs from shared between meta query clauses.

Introduced in <a href="http://buddypress.trac.wordpress.org/changeset/9178">[9178]</a>.

Props thomaslhotta, r-a-y.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7202">#7202</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilequeryphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-query.php</a></li>
<li><a href="#trunktestsphpunittestcasesxprofileclassbpxprofilequeryphp">trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-query.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofileclassesclassbpxprofilequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-query.php 2016-08-18 18:51:16 UTC (rev 11017)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-query.php   2016-08-19 17:42:41 UTC (rev 11018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,7 +515,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                $compatible_compares = array( '=', 'IN', 'BETWEEN', 'LIKE', 'REGEXP', 'RLIKE', '>', '>=', '<', '<=' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Clauses joined by AND with "negative" operators share a join only if they also share a key.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } elseif ( isset( $sibling['field_id'] ) && isset( $clause['field_id'] ) && $sibling['field_id'] === $clause['field_id'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } elseif ( isset( $sibling['field'] ) && isset( $clause['field'] ) && $sibling['field'] === $clause['field'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $compatible_compares = array( '!=', 'NOT IN', 'NOT LIKE' );
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunktestsphpunittestcasesxprofileclassbpxprofilequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-query.php        2016-08-18 18:51:16 UTC (rev 11017)
+++ trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-query.php  2016-08-19 17:42:41 UTC (rev 11018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,6 +472,38 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( $expected, array_keys( $q->results ) );
</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 BP7202
+        */
+       public function test_relation_and_with_compare_not_in() {
+               $this->create_fields( 1 );
+               $this->create_users( 4 );
+
+               xprofile_set_field_data( $this->fields[0], $this->users[0], 'boo' );
+               xprofile_set_field_data( $this->fields[0], $this->users[3], 'far' );
+               xprofile_set_field_data( $this->fields[0], $this->users[1], 'foo' );
+               xprofile_set_field_data( $this->fields[0], $this->users[2], 'bar' );
+
+               $q = new BP_User_Query( array(
+                       'xprofile_query' => array(
+                               'relation' => 'AND',
+                               array(
+                                       'field' => $this->fields[0],
+                                       'compare' => 'NOT IN',
+                                       'value' => array( 'foo', 'bar' )
+                               ),
+                               array(
+                                       'field' => $this->fields[0],
+                                       'compare' => '!=',
+                                       'value' => 'far',
+                               ),
+                       ),
+               ) );
+
+               $expected = array( $this->users[0] );
+               $this->assertEqualSets( $expected, array_keys( $q->results ) );
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         public function test_relation_or_with_compare_not_exists() {
</span><span class="cx" style="display: block; padding: 0 10px">                $this->create_fields( 2 );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->create_users( 4 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,6 +599,31 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( $expected, array_keys( $q->results ) );
</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 BP7202
+        */
+       public function test_find_compatible_table_alias_should_match_negative_siblings_joined_with_relation_and() {
+               $this->create_fields( 1 );
+
+               $q = new BP_XProfile_Query( array(
+                       'relation' => 'AND',
+                       array(
+                               'field' => $this->fields[0],
+                               'compare' => '!=',
+                               'value' => 'foo',
+                       ),
+                       array(
+                               'field' => $this->fields[0],
+                               'compare' => 'NOT IN',
+                               'value' => array( 'bar', 'baz' ),
+                       )
+               ) );
+
+               $sql = $q->get_sql( buddypress()->profile->table_name_data, 'user_id' );
+
+               $this->assertSame( 1, substr_count( $sql['join'], 'INNER JOIN' ) );
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         /** Helpers **********************************************************/
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        protected function create_fields( $count ) {
</span></span></pre>
</div>
</div>

</body>
</html>