<!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][10435] trunk: In activity queries, use `id` column for secondary sort.</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/10435">10435</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/10435","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-01-05 04:00:00 +0000 (Tue, 05 Jan 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 activity queries, use `id` column for secondary sort.
The default sort order for activity queries is by `date_recorded`. But this
order can be indeterminate when two items share the same `date_recorded`. To
prevent indeterminacy, we fall back on the always unique `id` column.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6720">#6720</a>.
Props henry.wright, Mamaduka.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityclassesclassbpactivityactivityphp">trunk/src/bp-activity/classes/class-bp-activity-activity.php</a></li>
<li><a href="#trunktestsphpunittestcasesactivitytemplatephp">trunk/tests/phpunit/testcases/activity/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivityclassesclassbpactivityactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/classes/class-bp-activity-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/classes/class-bp-activity-activity.php 2016-01-03 06:14:41 UTC (rev 10434)
+++ trunk/src/bp-activity/classes/class-bp-activity-activity.php 2016-01-05 04:00:00 UTC (rev 10435)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,7 +528,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pag_sql = $wpdb->prepare( "LIMIT %d, %d", absint( ( $page - 1 ) * $per_page ), $per_page );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in bp-activity/bp-activity-classes.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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} {$pag_sql}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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}, a.id {$sort} {$pag_sql}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $pag_sql = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,12 +543,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $where_sql Final WHERE MySQL statement portion for legacy query.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $sort Final sort direction for legacy query.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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, $pag_sql ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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}, a.id {$sort}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Query first for activity IDs.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $activity_ids_sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activity_ids_sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}, a.id {$sort}";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $per_page ) && ! empty( $page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // We query for $per_page + 1 items in order to
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivitytemplatephp"></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/activity/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/activity/template.php 2016-01-03 06:14:41 UTC (rev 10434)
+++ trunk/tests/phpunit/testcases/activity/template.php 2016-01-05 04:00:00 UTC (rev 10435)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,6 +525,89 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 scope
+ * @ticket BP6720
+ */
+ public function test_bp_has_activities_scope_friends_should_respect_id_order_when_record_dates_are_same() {
+ $u1 = $this->factory->user->create();
+ $u2 = $this->factory->user->create();
+
+ friends_add_friend( $u1, $u2, true );
+
+ // Friend's very fast status updates.
+ $a1 = $this->factory->activity->create( array(
+ 'user_id' => $u2,
+ 'type' => 'activity_update',
+ 'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+ ) );
+ $a2 = $this->factory->activity->create( array(
+ 'user_id' => $u2,
+ 'type' => 'activity_update',
+ 'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+ ) );
+
+ global $activities_template;
+ $reset_activities_template = $activities_template;
+
+ // Get activities in 'friends' scope
+ bp_has_activities( array(
+ 'user_id' => $u1,
+ 'scope' => 'friends',
+ ) );
+
+ $found = $activities_template->activities;
+
+ // Clean up!
+ $activities_template = $reset_activities_template;
+
+ $this->assertEquals( array( $a2, $a1 ), wp_list_pluck( $found, 'id' ) );
+ }
+
+ /**
+ * @group scope
+ * @ticket BP6720
+ */
+ public function test_bp_has_activities_scope_groups_should_respect_id_order_when_record_dates_are_same() {
+ $u1 = $this->factory->user->create();
+ $u2 = $this->factory->user->create();
+ $u3 = $this->factory->user->create();
+
+ $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
+
+ // Two user join first user's group same time
+ $a1 = $this->factory->activity->create( array(
+ 'user_id' => $u2,
+ 'component' => 'groups',
+ 'item_id' => $g1,
+ 'type' => 'joined_group',
+ 'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+ ) );
+ $a2 = $this->factory->activity->create( array(
+ 'user_id' => $u3,
+ 'component' => 'groups',
+ 'item_id' => $g1,
+ 'type' => 'joined_group',
+ 'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+ ) );
+
+ global $activities_template;
+ $reset_activities_template = $activities_template;
+
+ // Get activities in 'groups' scope
+ bp_has_activities( array(
+ 'user_id' => $u1,
+ 'scope' => 'groups',
+ ) );
+
+ $found = $activities_template->activities;
+
+ // Clean up!
+ $activities_template = $reset_activities_template;
+
+ $this->assertEquals( array( $a2, $a1 ), wp_list_pluck( $found, 'id' ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group filter_query
</span><span class="cx" style="display: block; padding: 0 10px"> * @group BP_Activity_Query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>