Changeset 26053

Timestamp:

11/08/2013 10:51:03 PM (13 years ago)

Author:

wonderboymusic

Message:

Respect the compare operator value in meta_query when value evaluates to null. Adds Unit Test.

Props bradyvercher, gradyetc.
Fixes #22967.

Location:

trunk

Files:

• src/wp-includes/meta.php (modified) (2 diffs)
• 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 ( ! isset( $q['value'] ) && ! empty( $q['key'] ) )
+                                if ( ! array_key_exists( 'value', $q ) && ! empty( $q['key'] ) )
                                         $key_only_queries[$k] = $q;
                                 else
@@ -774 +774 @@
                         $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
                         $meta_type = $this->get_cast_for_type( isset( $q['type'] ) ? $q['type'] : '' );
+
+                        if ( array_key_exists( 'value', $q ) && is_null( $q['value'] ) )
+                                $q['value'] = '';
 
                         $meta_value = isset( $q['value'] ) ? $q['value'] : null;

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

@@ -106 +106 @@
 
         }
+
+        /**
+         * @ticket 22967
+         */ 
+        function test_null_value_sql() {
+                global $wpdb;
+
+                $query = new WP_Meta_Query( array(
+                        array( 'key' => 'abc', 'value' => null, 'compare' => '=' )
+                ) );
+                $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
+
+                $this->assertEquals( 1, substr_count( $sql['where'], "CAST($wpdb->postmeta.meta_value AS CHAR) = '')" ) );
+        }
 }