Ticket #7202: 7202.diff

src/bp-xprofile/classes/class-bp-xprofile-query.php

@@ -515 +515 @@
                                 $compatible_compares = array( '=', 'IN', 'BETWEEN', 'LIKE', 'REGEXP', 'RLIKE', '>', '>=', '<', '<=' );
 
                         // Clauses joined by AND with "negative" operators share a join only if they also share a key.
-                        } elseif ( isset( $sibling['field_id'] ) && isset( $clause['field_id'] ) && $sibling['field_id'] === $clause['field_id'] ) {
+                        } elseif ( isset( $sibling['field'] ) && isset( $clause['field'] ) && $sibling['field'] === $clause['field'] ) {
                                 $compatible_compares = array( '!=', 'NOT IN', 'NOT LIKE' );
                         }
 

tests/phpunit/testcases/xprofile/class-bp-xprofile-query.php

@@ -472 +472 @@
                 $this->assertEqualSets( $expected, array_keys( $q->results ) );
         }
 
+        /**
+         * @ticket BP7202
+         */
+        public function test_relation_and_with_compare_not_in() {
+                $this->create_fields( 1 );
+                $this->create_users( 4 );
+
+                xprofile_set_field_data( $this->fields[0], $this->users[0], 'boo' );
+                xprofile_set_field_data( $this->fields[0], $this->users[3], 'far' );
+                xprofile_set_field_data( $this->fields[0], $this->users[1], 'foo' );
+                xprofile_set_field_data( $this->fields[0], $this->users[2], 'bar' );
+
+                $q = new BP_User_Query( array(
+                        'xprofile_query' => array(
+                                'relation' => 'AND',
+                                array(
+                                        'field' => $this->fields[0],
+                                        'compare' => 'NOT IN',
+                                        'value' => array( 'foo', 'bar' )
+                                ),
+                                array(
+                                        'field' => $this->fields[0],
+                                        'compare' => '!=',
+                                        'value' => 'far',
+                                ),
+                        ),
+                ) );
+
+                $expected = array( $this->users[0] );
+                $this->assertEqualSets( $expected, array_keys( $q->results ) );
+        }
+
         public function test_relation_or_with_compare_not_exists() {
                 $this->create_fields( 2 );
                 $this->create_users( 4 );
@@ -567 +599 @@
                 $this->assertEqualSets( $expected, array_keys( $q->results ) );
         }
 
+        /**
+         * @group BP7202
+         */
+        public function test_find_compatible_table_alias_should_match_negative_siblings_joined_with_relation_and() {
+                $this->create_fields( 1 );
+
+                $q = new BP_XProfile_Query( array(
+                        'relation' => 'AND',
+                        array(
+                                'field' => $this->fields[0],
+                                'compare' => '!=',
+                                'value' => 'foo',
+                        ),
+                        array(
+                                'field' => $this->fields[0],
+                                'compare' => 'NOT IN',
+                                'value' => array( 'bar', 'baz' ),
+                        )
+                ) );
+
+                $sql = $q->get_sql( buddypress()->profile->table_name_data, 'user_id' );
+
+                $this->assertSame( 1, substr_count( $sql['join'], 'INNER JOIN' ) );
+        }
+
         /** Helpers **********************************************************/
 
         protected function create_fields( $count ) {