Changeset 7318

Timestamp:

07/26/2013 06:33:52 PM (13 years ago)

Author:

boonebgorges

Message:

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 #5118

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (2 diffs)
• tests/testcases/activity/class.BP_Activity_Activity.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-classes.php

@@ -156 +156 @@
 
                 // Select conditions
-                $select_sql = "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name";
+                $select_sql = "SELECT DISTINCT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name";
 
                 $from_sql = " FROM {$bp->activity->table_name} a LEFT JOIN {$wpdb->users} u ON a.user_id = u.ID";
@@ -248 +248 @@
                 }
 
-                $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 );
+                $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 );
 
                 $total_activities = $wpdb->get_var( $total_activities_sql );

trunk/tests/testcases/activity/class.BP_Activity_Activity.php

@@ -76 +76 @@
         /**
          * @group get
+         * @group meta_query
          */
         public function test_get_with_meta_query() {
@@ -92 +93 @@
                 $ids = wp_list_pluck( $activity['activities'], 'id' );
                 $this->assertEquals( $ids, array( $a1 ) );
+        }
+
+        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'] );
         }