Changeset 32713 for trunk/tests/phpunit/tests/meta/query.php

Timestamp:

06/09/2015 05:41:35 PM (10 years ago)

Author:

boonebgorges

Message:

Avoid returning duplicate matches when using a meta query in WP_User_Query.

A meta_query containing an OR relation can result in the same record matching
multiple clauses, leading to duplicate results. The previous prevention against
duplicates [18178] #17582 became unreliable in 4.1 when WP_Meta_Query
introduced support for nested clauses. The current changeset adds a new method
WP_Meta_Query::has_or_relation() for checking whether an OR relation
appears anywhere in the query, and uses the new method in WP_User_Query to
enforce distinct results as necessary.

Props maxxsnake.
Fixes #32592.

File:

• trunk/tests/phpunit/tests/meta/query.php (modified) (1 diff)

trunk/tests/phpunit/tests/meta/query.php

@@ -807 +807 @@
         $this->assertNotContains( "{$wpdb->postmeta}.post_id IS NULL", $sql['where'] );
     }
+
+    /**
+     * @group 32592
+     */
+    public function test_has_or_relation_should_return_false() {
+        $q = new WP_Meta_Query( array(
+            'relation' => 'AND',
+            array(
+                'key' => 'foo',
+                'value' => 'bar',
+            ),
+            array(
+                'relation' => 'AND',
+                array(
+                    'key' => 'foo1',
+                    'value' => 'bar',
+                ),
+                array(
+                    'key' => 'foo2',
+                    'value' => 'bar',
+                ),
+            ),
+        ) );
+
+        $this->assertFalse( $q->has_or_relation() );
+    }
+
+    /**
+     * @group 32592
+     */
+    public function test_has_or_relation_should_return_true_for_top_level_or() {
+        $q = new WP_Meta_Query( array(
+            'relation' => 'OR',
+            array(
+                'key' => 'foo',
+                'value' => 'bar',
+            ),
+            array(
+                'relation' => 'AND',
+                array(
+                    'key' => 'foo1',
+                    'value' => 'bar',
+                ),
+                array(
+                    'key' => 'foo2',
+                    'value' => 'bar',
+                ),
+            ),
+        ) );
+
+        $this->assertTrue( $q->has_or_relation() );
+    }
+
+    /**
+     * @group 32592
+     */
+    public function test_has_or_relation_should_return_true_for_nested_or() {
+        $q = new WP_Meta_Query( array(
+            'relation' => 'AND',
+            array(
+                'key' => 'foo',
+                'value' => 'bar',
+            ),
+            array(
+                'relation' => 'OR',
+                array(
+                    'key' => 'foo1',
+                    'value' => 'bar',
+                ),
+                array(
+                    'key' => 'foo2',
+                    'value' => 'bar',
+                ),
+            ),
+        ) );
+
+        $this->assertTrue( $q->has_or_relation() );
+    }
 }