<!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][8949] trunk: Simplify logic that transforms WP_Meta_Query SQL for Groups queries</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://buddypress.trac.wordpress.org/changeset/8949">8949</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-08-20 18:32:30 +0000 (Wed, 20 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify logic that transforms WP_Meta_Query SQL for Groups queries
This simplified logic fixes a bug related to the use of the 'compare'
operator in certain cases.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5824">#5824</a>
Props imath</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupsclassesphp">trunk/src/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsclassbpgroupsgroupphp">trunk/tests/phpunit/testcases/groups/class-bp-groups-group.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-classes.php (8948 => 8949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-classes.php 2014-08-20 15:30:40 UTC (rev 8948)
+++ trunk/src/bp-groups/bp-groups-classes.php 2014-08-20 18:32:30 UTC (rev 8949)
</span><span class="lines">@@ -891,19 +891,8 @@
</span><span class="cx"> preg_match_all( '/ON \((.*)\)/', $meta_sql['join'], $matches_b );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $matches_a[1] ) && ! empty( $matches_b[1] ) ) {
</span><del>- $sql_array['join'] = implode( ',', $matches_a[1] ). ', ';
-
- $sql_array['where'] = '';
-
- $meta_query_where_clauses = explode( "\n", $meta_sql['where'] );
-
- // Trim empties
- $meta_query_where_clauses = array_values( array_filter( $meta_query_where_clauses ) );
-
- foreach( $matches_b[1] as $key => $group_id_clause ) {
- $sql_array['where'] .= ' ' . preg_replace( '/^(AND\s+[\(\s]+)/', '$1' . $group_id_clause . ' AND ', ltrim( $meta_query_where_clauses[ $key ] ) );
- }
-
</del><ins>+ $sql_array['join'] = implode( ',', $matches_a[1] ) . ', ';
+ $sql_array['where'] = $meta_sql['where'] . ' AND ' . implode ( ' AND ', $matches_b[1] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsclassbpgroupsgroupphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/testcases/groups/class-bp-groups-group.php (8948 => 8949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/testcases/groups/class-bp-groups-group.php 2014-08-20 15:30:40 UTC (rev 8948)
+++ trunk/tests/phpunit/testcases/groups/class-bp-groups-group.php 2014-08-20 18:32:30 UTC (rev 8949)
</span><span class="lines">@@ -136,7 +136,74 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @group get
</span><ins>+ * @group group_meta_query
</ins><span class="cx"> */
</span><ins>+ public function test_get_with_meta_query_multiple_clauses_relation_or() {
+ $now = time();
+ $g1 = $this->factory->group->create( array(
+ 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60 ),
+ ) );
+ $g2 = $this->factory->group->create( array(
+ 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*2 ),
+ ) );
+ $g3 = $this->factory->group->create( array(
+ 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*3 ),
+ ) );
+ groups_update_groupmeta( $g1, 'foo', 'bar' );
+ groups_update_groupmeta( $g2, 'foo', 'baz' );
+ groups_update_groupmeta( $g3, 'bar', 'barry' );
+
+ $groups = BP_Groups_Group::get( array(
+ 'meta_query' => array(
+ 'relation' => 'OR',
+ array(
+ 'key' => 'foo',
+ 'value' => 'bar',
+ ),
+ array(
+ 'key' => 'bar',
+ 'value' => 'barry',
+ ),
+ ),
+ ) );
+ $ids = wp_list_pluck( $groups['groups'], 'id' );
+ $this->assertEquals( array( $g1, $g3 ), $ids );
+ $this->assertEquals( 2, $groups['total'] );
+ }
+
+ /**
+ * @group get
+ * @group group_meta_query
+ * @ticket BP5824
+ */
+ public function test_get_with_meta_query_multiple_keys_with_same_value() {
+ $now = time();
+ $g1 = $this->factory->group->create( array(
+ 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60 ),
+ ) );
+ $g2 = $this->factory->group->create( array(
+ 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*2 ),
+ ) );
+ groups_update_groupmeta( $g1, 'foo', 'bar' );
+ groups_update_groupmeta( $g2, 'foo2', 'bar' );
+
+ $groups = BP_Groups_Group::get( array(
+ 'meta_query' => array(
+ array(
+ 'key' => 'foo',
+ 'value' => 'bar',
+ 'compare' => '=',
+ ),
+ ),
+ ) );
+ $ids = wp_list_pluck( $groups['groups'], 'id' );
+ $this->assertEquals( $ids, array( $g1 ) );
+ $this->assertEquals( 1, $groups['total'] );
+ }
+
+ /**
+ * @group get
+ */
</ins><span class="cx"> public function test_get_normal_search() {
</span><span class="cx"> $g1 = $this->factory->group->create( array(
</span><span class="cx"> 'name' => 'Cool Group',
</span></span></pre>
</div>
</div>
</body>
</html>