vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 15:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved 'orderby' meta syntax in WP_User_Query.

Browse Source 
Recent commits have added the ability to order query results by specific
clauses of the 'meta_query' parameter (comments [31467], posts [31312] and
[31340]). The current changeset ports the same functionality to `WP_User_Query`.

Also introduced is the ability to pass the value of `$meta_key` to 'orderby'.

The internals of `WP_User_Query::prepare_users()` had to be reordered
somewhat to support these changes, primarily to ensure that the `meta_query`
object generates its SQL clauses before the 'orderby' parameter is parsed.

See #31265.

git-svn-id: https://develop.svn.wordpress.org/trunk@31669 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges
2015-03-07 18:37:05 +00:00
parent 6a4839bd83
commit a11372afe1
2 changed files with 172 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
tests/phpunit/tests/user/query.php
View File

@@ -179,6 +179,123 @@ class Tests_User_Query extends WP_UnitTestCase {
$this->assertEquals( $expected, $q->get_results() );
}
/**
* @ticket 31265
*/
public function test_orderby_somekey_where_meta_key_is_somekey() {
$users = $this->factory->user->create_many( 3, array(
'role' => 'author'
) );
update_user_meta( $users[0], 'foo', 'zzz' );
update_user_meta( $users[1], 'foo', 'aaa' );
update_user_meta( $users[2], 'foo', 'jjj' );
$q = new WP_User_Query( array(
'include' => $users,
'meta_key' => 'foo',
'orderby' => 'foo',
'fields' => 'ids'
) );
$expected = array( $users[1], $users[2], $users[0] );
$this->assertEquals( $expected, $q->get_results() );
}
/**
* @ticket 31265
*/
public function test_orderby_clause_key() {
$users = $this->factory->user->create_many( 3 );
add_user_meta( $users[0], 'foo', 'aaa' );
add_user_meta( $users[1], 'foo', 'zzz' );
add_user_meta( $users[2], 'foo', 'jjj' );
$q = new WP_User_Query( array(
'fields' => 'ids',
'meta_query' => array(
'foo_key' => array(
'key' => 'foo',
'compare' => 'EXISTS',
),
),
'orderby' => 'foo_key',
'order' => 'DESC',
) );
$this->assertEquals( array( $users[1], $users[2], $users[0] ), $q->results );
}
/**
* @ticket 31265
*/
public function test_orderby_clause_key_as_secondary_sort() {
$u1 = $this->factory->user->create( array(
'user_registered' => '2015-01-28 03:00:00',
) );
$u2 = $this->factory->user->create( array(
'user_registered' => '2015-01-28 05:00:00',
) );
$u3 = $this->factory->user->create( array(
'user_registered' => '2015-01-28 03:00:00',
) );
add_user_meta( $u1, 'foo', 'jjj' );
add_user_meta( $u2, 'foo', 'zzz' );
add_user_meta( $u3, 'foo', 'aaa' );
$q = new WP_User_Query( array(
'fields' => 'ids',
'meta_query' => array(
'foo_key' => array(
'key' => 'foo',
'compare' => 'EXISTS',
),
),
'orderby' => array(
'comment_date' => 'asc',
'foo_key' => 'asc',
),
) );
$this->assertEquals( array( $u3, $u1, $u2 ), $q->results );
}
/**
* @ticket 31265
*/
public function test_orderby_more_than_one_clause_key() {
$users = $this->factory->user->create_many( 3 );
add_user_meta( $users[0], 'foo', 'jjj' );
add_user_meta( $users[1], 'foo', 'zzz' );
add_user_meta( $users[2], 'foo', 'jjj' );
add_user_meta( $users[0], 'bar', 'aaa' );
add_user_meta( $users[1], 'bar', 'ccc' );
add_user_meta( $users[2], 'bar', 'bbb' );
$q = new WP_User_Query( array(
'fields' => 'ids',
'meta_query' => array(
'foo_key' => array(
'key' => 'foo',
'compare' => 'EXISTS',
),
'bar_key' => array(
'key' => 'bar',
'compare' => 'EXISTS',
),
),
'orderby' => array(
'foo_key' => 'asc',
'bar_key' => 'desc',
),
) );
$this->assertEquals( array( $users[2], $users[0], $users[1] ), $q->results );
}
/**
* @ticket 30064
*/