Changeset 8949

Timestamp:

08/20/2014 06:32:30 PM (12 years ago)

Author:

boonebgorges

Message:

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

Props imath

Location:

trunk

Files:

• src/bp-groups/bp-groups-classes.php (modified) (1 diff)
• tests/phpunit/testcases/groups/class-bp-groups-group.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-classes.php

@@ -892 +892 @@
 
                         if ( ! empty( $matches_a[1] ) && ! empty( $matches_b[1] ) ) {
-                                $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 ] ) );
-                                }
-
+                                $sql_array['join']  = implode( ',', $matches_a[1] ) . ', ';
+                                $sql_array['where'] = $meta_sql['where'] . ' AND ' . implode ( ' AND ', $matches_b[1] );
                         }
                 }

trunk/tests/phpunit/testcases/groups/class-bp-groups-group.php

@@ -137 +137 @@
         /**
          * @group get
+         * @group group_meta_query
+         */
+        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
          */
         public function test_get_normal_search() {