Changeset 11018

Timestamp:

08/19/2016 05:42:41 PM (8 years ago)

Author:

boonebgorges

Message:

In BP_XProfile_Query, fix variable name typo that prevented table JOINs from shared between meta query clauses.

Introduced in [9178].

Props thomaslhotta, r-a-y.
Fixes #7202.

Location:

trunk

Files:

• src/bp-xprofile/classes/class-bp-xprofile-query.php (modified) (1 diff)
• tests/phpunit/testcases/xprofile/class-bp-xprofile-query.php (modified) (2 diffs)

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

@@ -516 +516 @@
 
             // 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' );
             }

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

@@ -470 +470 @@
 
         $expected = array( $this->users[3] );
+        $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 ) );
     }
@@ -568 +600 @@
     }
 
+    /**
+     * @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 **********************************************************/