Changeset 27689

Timestamp:

03/24/2014 07:56:54 PM (12 years ago)

Author:

wonderboymusic

Message:

When using meta_query in a WP_Query, passing NOT EXISTS or '' to compare should not require value to be set. The resulting SQL should then produce the appropriate OR clause for existence of non-existence after passing the query to the $key_only_queries stack internally.

Adds unit tests.

Props chrisguitarguy, for the original patch.
Fixes #23268.

Location:

trunk

Files:

• src/wp-includes/meta.php (modified) (1 diff)
• tests/phpunit/tests/meta/query.php (modified) (1 diff)

trunk/src/wp-includes/meta.php

@@ -754 +754 @@
                 if ( 'OR' == $this->relation ) {
                         foreach ( $this->queries as $k => $q ) {
-                                if ( ! array_key_exists( 'value', $q ) && ! empty( $q['key'] ) )
+                                if ( ( empty( $q['compare'] ) || 'NOT EXISTS' != $q['compare'] ) && ! array_key_exists( 'value', $q ) && ! empty( $q['key'] ) )
                                         $key_only_queries[$k] = $q;
                                 else

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

@@ -153 +153 @@
                 $this->assertEquals( 'CHAR', $query->get_cast_for_type( 'ANYTHING ELSE' ) );
         }
+
+        function test_not_exists() {
+                global $wpdb;
+
+                $query = new WP_Meta_Query( array(
+                        'relation' => 'OR',
+                        array(
+                                'key' => 'exclude',
+                                'compare' => 'NOT EXISTS'
+                        ),
+                        array(
+                                'key' => 'exclude',
+                                'compare' => '!=',
+                                'value' => '1'
+                        ),
+                ) );
+
+                $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
+                $this->assertNotContains( "{$wpdb->postmeta}.meta_key = 'exclude'\nOR", $sql['where'] );
+                $this->assertContains( "{$wpdb->postmeta}.post_id IS NULL", $sql['where'] );
+        }
+
+        function test_empty_compare() {
+                global $wpdb;
+
+                $query = new WP_Meta_Query( array(
+                        'relation' => 'OR',
+                        array(
+                                'key' => 'exclude',
+                                'compare' => ''
+                        ),
+                        array(
+                                'key' => 'exclude',
+                                'compare' => '!=',
+                                'value' => '1'
+                        ),
+                ) );
+
+                $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
+                $this->assertContains( "{$wpdb->postmeta}.meta_key = 'exclude'\nOR", $sql['where'] );
+                $this->assertNotContains( "{$wpdb->postmeta}.post_id IS NULL", $sql['where'] );
+        }
 }