<!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][7324] branches/1.8: Enforce DISTINCT in BP_Activity_Activity::get() 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/7324">7324</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-07-27 18:09:57 +0000 (Sat, 27 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enforce DISTINCT in BP_Activity_Activity::get() queries
Previously, we've never really needed to state DISTINCT explicitly in
BP_Activity_Activity::get(), because the kinds of queries we ran would
naturally result in the exclusion of duplicates. The introduction of
the meta_query parameter in 1.8 - and in particular, the ability to
introduce more than one meta_query clause separated by the inclusive
OR relation - uncovered the bug, as single activity items were matching
more than one clause in the meta_query and thus being returned in the
results more than once.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5118">#5118</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches18bpactivitybpactivityclassesphp">branches/1.8/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#branches18teststestcasesactivityclassBP_Activity_Activityphp">branches/1.8/tests/testcases/activity/class.BP_Activity_Activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches18bpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: branches/1.8/bp-activity/bp-activity-classes.php (7323 => 7324)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.8/bp-activity/bp-activity-classes.php 2013-07-27 18:06:48 UTC (rev 7323)
+++ branches/1.8/bp-activity/bp-activity-classes.php 2013-07-27 18:09:57 UTC (rev 7324)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> extract( $r );
</span><span class="cx">
</span><span class="cx"> // Select conditions
</span><del>- $select_sql = "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name";
</del><ins>+ $select_sql = "SELECT DISTINCT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name";
</ins><span class="cx">
</span><span class="cx"> $from_sql = " FROM {$bp->activity->table_name} a LEFT JOIN {$wpdb->users} u ON a.user_id = u.ID";
</span><span class="cx">
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $select_sql, $from_sql, $where_sql, $sort ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', "SELECT count(a.id) FROM {$bp->activity->table_name} a {$index_hint_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $where_sql, $sort );
</del><ins>+ $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', "SELECT count(DISTINCT a.id) FROM {$bp->activity->table_name} a {$index_hint_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $where_sql, $sort );
</ins><span class="cx">
</span><span class="cx"> $total_activities = $wpdb->get_var( $total_activities_sql );
</span><span class="cx">
</span></span></pre></div>
<a id="branches18teststestcasesactivityclassBP_Activity_Activityphp"></a>
<div class="modfile"><h4>Modified: branches/1.8/tests/testcases/activity/class.BP_Activity_Activity.php (7323 => 7324)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.8/tests/testcases/activity/class.BP_Activity_Activity.php 2013-07-27 18:06:48 UTC (rev 7323)
+++ branches/1.8/tests/testcases/activity/class.BP_Activity_Activity.php 2013-07-27 18:09:57 UTC (rev 7324)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @group get
</span><ins>+ * @group meta_query
</ins><span class="cx"> */
</span><span class="cx"> public function test_get_with_meta_query() {
</span><span class="cx"> $a1 = $this->factory->activity->create();
</span><span class="lines">@@ -93,6 +94,40 @@
</span><span class="cx"> $this->assertEquals( $ids, array( $a1 ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public function test_get_with_meta_query_two_clauses_with_or_relation() {
+ $now = time();
+ $a1 = $this->factory->activity->create( array(
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+ ) );
+ $a2 = $this->factory->activity->create( array(
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now - 60 ),
+ ) );
+ $a3 = $this->factory->activity->create( array(
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now - 120 ),
+ ) );
+ bp_activity_update_meta( $a1, 'foo', 'bar' );
+ bp_activity_update_meta( $a2, 'foo', 'bar' );
+ bp_activity_update_meta( $a1, 'baz', 'barry' );
+
+ $activity = BP_Activity_Activity::get( array(
+ 'meta_query' => array(
+ 'relation' => 'OR',
+ array(
+ 'key' => 'foo',
+ 'value' => 'bar',
+ ),
+ array(
+ 'key' => 'baz',
+ 'value' => 'barry',
+ ),
+ ),
+ ) );
+
+ $ids = wp_list_pluck( $activity['activities'], 'id' );
+ $this->assertEquals( array( $a1, $a2 ), $ids );
+ $this->assertEquals( 2, $activity['total'] );
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * @group get
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>