Respect the `compare` operator value in `meta_query` when `value` evaluates to `null`. Adds Unit Test.
Props bradyvercher, gradyetc. Fixes #22967. git-svn-id: https://develop.svn.wordpress.org/trunk@26053 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
0670cf7cc4
commit
cc19bb3a57
|
@ -753,7 +753,7 @@ class WP_Meta_Query {
|
||||||
// Split out the meta_key only queries (we can only do this for OR)
|
// Split out the meta_key only queries (we can only do this for OR)
|
||||||
if ( 'OR' == $this->relation ) {
|
if ( 'OR' == $this->relation ) {
|
||||||
foreach ( $this->queries as $k => $q ) {
|
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;
|
$key_only_queries[$k] = $q;
|
||||||
else
|
else
|
||||||
$queries[$k] = $q;
|
$queries[$k] = $q;
|
||||||
|
@ -774,6 +774,9 @@ class WP_Meta_Query {
|
||||||
$meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
|
$meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
|
||||||
$meta_type = $this->get_cast_for_type( isset( $q['type'] ) ? $q['type'] : '' );
|
$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;
|
$meta_value = isset( $q['value'] ) ? $q['value'] : null;
|
||||||
|
|
||||||
if ( isset( $q['compare'] ) )
|
if ( isset( $q['compare'] ) )
|
||||||
|
|
|
@ -105,4 +105,18 @@ class Tests_Meta_Query extends WP_UnitTestCase {
|
||||||
$this->assertEquals( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_key = 'my_third_key'" ) );
|
$this->assertEquals( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_key = 'my_third_key'" ) );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @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) = '')" ) );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue