sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make orderby=meta_value compatible with meta_query when relation=OR.

Browse Source 
Passing orderby=meta_value and meta_key=foo to WP_Query should require that
each matched post have a meta value with the key 'foo'. To make this
requirement compatible with meta_query params that have the relation OR, we
nest the meta_query param, and join it using AND to a meta_query clause
generated from the meta_key/meta_compare/meta_type query vars.

Fixes #25538.

git-svn-id: https://develop.svn.wordpress.org/trunk@29964 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2014-10-19 18:53:55 +00:00
parent 512ea93ae4
commit 91733ae919
3 changed files with 117 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/wp-includes/meta.php
View File

@ -1057,18 +1057,38 @@ class WP_Meta_Query {
public function parse_query_vars( $qv ) { public function parse_query_vars( $qv ) {
$meta_query = array(); $meta_query = array();
// Simple query needs to be first for orderby=meta_value to work correctly. /*
* For orderby=meta_value to work correctly, simple query needs to be
* first (so that its table join is against an unaliased meta table) and
* needs to be its own clause (so it doesn't interfere with the logic of
* the rest of the meta_query).
*/
$primary_meta_query = array();
foreach ( array( 'key', 'compare', 'type' ) as $key ) { foreach ( array( 'key', 'compare', 'type' ) as $key ) {
if ( !empty( $qv[ "meta_$key" ] ) ) if ( ! empty( $qv[ "meta_$key" ] ) ) {
$meta_query[0][ $key ] = $qv[ "meta_$key" ]; $primary_meta_query[ $key ] = $qv[ "meta_$key" ];
}
} }
// WP_Query sets 'meta_value' = '' by default. // WP_Query sets 'meta_value' = '' by default.
if ( isset( $qv[ 'meta_value' ] ) && '' !== $qv[ 'meta_value' ] && ( ! is_array( $qv[ 'meta_value' ] ) || $qv[ 'meta_value' ] ) ) if ( isset( $qv['meta_value'] ) && '' !== $qv['meta_value'] && ( ! is_array( $qv['meta_value'] ) || $qv['meta_value'] ) ) {
$meta_query[0]['value'] = $qv[ 'meta_value' ]; $primary_meta_query['value'] = $qv['meta_value'];
}
if ( !empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) { $existing_meta_query = isset( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ? $qv['meta_query'] : array();
$meta_query = array_merge( $meta_query, $qv['meta_query'] );
if ( ! empty( $primary_meta_query ) && ! empty( $existing_meta_query ) ) {
$meta_query = array(
'relation' => 'AND',
$primary_meta_query,
$existing_meta_query,
);
} else if ( ! empty( $primary_meta_query ) ) {
$meta_query = array(
$primary_meta_query,
);
} else if ( ! empty( $existing_meta_query ) ) {
$meta_query = $existing_meta_query;
} }
$this->__construct( $meta_query ); $this->__construct( $meta_query );

9
tests/phpunit/tests/meta/query.php
View File

@ -104,9 +104,12 @@ class Tests_Meta_Query extends WP_UnitTestCase {
$this->assertEquals( $expected0, $query->queries[0] ); $this->assertEquals( $expected0, $query->queries[0] );
$expected1 = array( $expected1 = array(
'key' => 'foo1', 'relation' => 'OR',
'compare' => 'baz1', array(
'value' => 'bar1', 'key' => 'foo1',
'compare' => 'baz1',
'value' => 'bar1',
),
); );
$this->assertEquals( $expected1, $query->queries[1] ); $this->assertEquals( $expected1, $query->queries[1] );
} }

84
tests/phpunit/tests/post/query.php
View File

@ -1187,6 +1187,90 @@ class Tests_Post_Query extends WP_UnitTestCase {
$this->assertEqualSets( array( $post_4, $post_3, $post_2, $post_1 ), $query->posts ); $this->assertEqualSets( array( $post_4, $post_3, $post_2, $post_1 ), $query->posts );
} }
/**
* @group meta
* @ticket 29604
*/
public function test_meta_query_with_orderby_meta_value_relation_or() {
$posts = $this->factory->post->create_many( 4 );
update_post_meta( $posts[0], 'foo', 5 );
update_post_meta( $posts[1], 'foo', 6 );
update_post_meta( $posts[2], 'foo', 4 );
update_post_meta( $posts[3], 'foo', 7 );
update_post_meta( $posts[0], 'bar1', 'baz' );
update_post_meta( $posts[1], 'bar1', 'baz' );
update_post_meta( $posts[2], 'bar2', 'baz' );
$query = new WP_Query( array(
'orderby' => 'meta_value',
'order' => 'ASC',
'meta_key' => 'foo',
'meta_query' => array(
'relation' => 'OR',
array(
'key' => 'bar1',
'value' => 'baz',
'compare' => '=',
),
array(
'key' => 'bar2',
'value' => 'baz',
'compare' => '=',
),
),
'update_post_meta_cache' => false,
'update_post_term_cache' => false,
'fields' => 'ids',
) );
$this->assertEquals( array( $posts[2], $posts[0], $posts[1] ), $query->posts );
}
/**
* @group meta
* @ticket 29604
*/
public function test_meta_query_with_orderby_meta_value_relation_and() {
$posts = $this->factory->post->create_many( 4 );
update_post_meta( $posts[0], 'foo', 5 );
update_post_meta( $posts[1], 'foo', 6 );
update_post_meta( $posts[2], 'foo', 4 );
update_post_meta( $posts[3], 'foo', 7 );
update_post_meta( $posts[0], 'bar1', 'baz' );
update_post_meta( $posts[1], 'bar1', 'baz' );
update_post_meta( $posts[2], 'bar1', 'baz' );
update_post_meta( $posts[3], 'bar1', 'baz' );
update_post_meta( $posts[0], 'bar2', 'baz' );
update_post_meta( $posts[1], 'bar2', 'baz' );
update_post_meta( $posts[2], 'bar2', 'baz' );
$query = new WP_Query( array(
'orderby' => 'meta_value',
'order' => 'ASC',
'meta_key' => 'foo',
'meta_query' => array(
'relation' => 'AND',
array(
'key' => 'bar1',
'value' => 'baz',
'compare' => '=',
),
array(
'key' => 'bar2',
'value' => 'baz',
'compare' => '=',
),
),
'update_post_meta_cache' => false,
'update_post_term_cache' => false,
'fields' => 'ids',
) );
$this->assertEquals( array( $posts[2], $posts[0], $posts[1] ), $query->posts );
}
/** /**
* @ticket 29642 * @ticket 29642
* @group meta * @group meta