WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modify `meta_query orderby syntax to use array keys as clause "handles". 

The implementation of `meta_query` orderby introduced in [31312] put clause
identifiers into a 'name' parameter of the clause. For greater clarity, this
changeset updates the syntax to use the associative array key used when
defining `meta_query` parameters, instead of the 'name' parameter.

Props Funkatronic, DrewAPicture.
Fixes #31045.
Built from https://develop.svn.wordpress.org/trunk@31340


git-svn-id: http://core.svn.wordpress.org/trunk@31321 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2015-02-05 19:38:23 +00:00
parent a8f8813e83
commit 7bde88d02e
3 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wp-includes/meta.php
View File

@ -945,12 +945,13 @@ class WP_Meta_Query {
* Constructor. * Constructor.
* *
* @since 3.2.0 * @since 3.2.0
* @since 4.2.0 Introduced the `$name` parameter, for improved `$orderby` support in the parent query. * @since 4.2.0 Introduced support for naming query clauses by associative array keys.
* *
* @access public * @access public
* *
* @param array $meta_query { * @param array $meta_query {
* Array of meta query clauses. * Array of meta query clauses. When first-order clauses use strings as their array keys, they may be
* referenced in the 'orderby' parameter of the parent query.
* *
* @type string $relation Optional. The MySQL keyword used to join * @type string $relation Optional. The MySQL keyword used to join
* the clauses of the query. Accepts 'AND', or 'OR'. Default 'AND'. * the clauses of the query. Accepts 'AND', or 'OR'. Default 'AND'.
@ -967,8 +968,6 @@ class WP_Meta_Query {
* comparisons. Accepts 'NUMERIC', 'BINARY', 'CHAR', 'DATE', * comparisons. Accepts 'NUMERIC', 'BINARY', 'CHAR', 'DATE',
* 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', or 'UNSIGNED'. * 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', or 'UNSIGNED'.
* Default is 'CHAR'. * Default is 'CHAR'.
* @type string $name Optional. A unique identifier for the clause. If provided, `$name` can be
* referenced in the `$orderby` parameter of the parent query.
* } * }
* } * }
*/ */
@ -1016,14 +1015,14 @@ class WP_Meta_Query {
unset( $query['value'] ); unset( $query['value'] );
} }
$clean_queries[] = $query; $clean_queries[ $key ] = $query;
// Otherwise, it's a nested query, so we recurse. // Otherwise, it's a nested query, so we recurse.
} else { } else {
$cleaned_query = $this->sanitize_query( $query ); $cleaned_query = $this->sanitize_query( $query );
if ( ! empty( $cleaned_query ) ) { if ( ! empty( $cleaned_query ) ) {
$clean_queries[] = $cleaned_query; $clean_queries[ $key ] = $cleaned_query;
} }
} }
} }
@ -1270,7 +1269,7 @@ class WP_Meta_Query {
// This is a first-order clause. // This is a first-order clause.
if ( $this->is_first_order_clause( $clause ) ) { if ( $this->is_first_order_clause( $clause ) ) {
$clause_sql = $this->get_sql_for_clause( $clause, $query ); $clause_sql = $this->get_sql_for_clause( $clause, $query, $key );
$where_count = count( $clause_sql['where'] ); $where_count = count( $clause_sql['where'] );
if ( ! $where_count ) { if ( ! $where_count ) {
@ -1323,6 +1322,8 @@ class WP_Meta_Query {
* *
* @param array $clause Query clause, passed by reference. * @param array $clause Query clause, passed by reference.
* @param array $parent_query Parent query array. * @param array $parent_query Parent query array.
* @param string $clause_key Optional. The array key used to name the clause in the original `$meta_query`
* parameters. If not provided, a key will be generated automatically.
* @return array { * @return array {
* Array containing JOIN and WHERE SQL clauses to append to a first-order query. * Array containing JOIN and WHERE SQL clauses to append to a first-order query.
* *
@ -1330,7 +1331,7 @@ class WP_Meta_Query {
* @type string $where SQL fragment to append to the main WHERE clause. * @type string $where SQL fragment to append to the main WHERE clause.
* } * }
*/ */
public function get_sql_for_clause( &$clause, $parent_query ) { public function get_sql_for_clause( &$clause, $parent_query, $clause_key = '' ) {
global $wpdb; global $wpdb;
$sql_chunks = array( $sql_chunks = array(
@ -1391,9 +1392,21 @@ class WP_Meta_Query {
$meta_type = $this->get_cast_for_type( $_meta_type ); $meta_type = $this->get_cast_for_type( $_meta_type );
$clause['cast'] = $meta_type; $clause['cast'] = $meta_type;
// Fallback for clause keys is the table alias.
if ( ! $clause_key ) {
$clause_key = $clause['alias'];
}
// Ensure unique clause keys, so none are overwritten.
$iterator = 1;
$clause_key_base = $clause_key;
while ( isset( $this->clauses[ $clause_key ] ) ) {
$clause_key = $clause_key_base . '-' . $iterator;
$iterator++;
}
// Store the clause in our flat array. // Store the clause in our flat array.
$clause_name = isset( $clause['name'] ) ? $clause['name'] : $clause['alias']; $this->clauses[ $clause_key ] =& $clause;
$this->clauses[ $clause_name ] =& $clause;
// Next, build the WHERE clause. // Next, build the WHERE clause.
@ -1471,7 +1484,7 @@ class WP_Meta_Query {
} }
/** /**
* Get a flattened list of sanitized meta clauses, indexed by clause 'name'. * Get a flattened list of sanitized meta clauses.
* *
* This array should be used for clause lookup, as when the table alias and CAST type must be determined for * This array should be used for clause lookup, as when the table alias and CAST type must be determined for
* a value of 'orderby' corresponding to a meta clause. * a value of 'orderby' corresponding to a meta clause.

13
wp-includes/query.php
View File

@ -1450,6 +1450,8 @@ class WP_Query {
* Parse a query string and set query type booleans. * Parse a query string and set query type booleans.
* *
* @since 1.5.0 * @since 1.5.0
* @since 4.2.0 Introduced the ability to order by specific clauses of a `$meta_query`, by passing the clause's
* array key to `$orderby`.
* @access public * @access public
* *
* @param string|array $query { * @param string|array $query {
@ -1497,11 +1499,14 @@ class WP_Query {
* @type int $offset The number of posts to offset before retrieval. * @type int $offset The number of posts to offset before retrieval.
* @type string $order Designates ascending or descending order of posts. Default 'DESC'. * @type string $order Designates ascending or descending order of posts. Default 'DESC'.
* Accepts 'ASC', 'DESC'. * Accepts 'ASC', 'DESC'.
* @type string $orderby Sort retrieved posts by parameter. One or more options can be * @type string|array $orderby Sort retrieved posts by parameter. One or more options may be
* passed. To use 'meta_value', or 'meta_value_num', * passed. To use 'meta_value', or 'meta_value_num',
* 'meta_key=keyname' must be also be defined. Default 'date'. * 'meta_key=keyname' must be also be defined. To sort by a
* Accepts 'none', 'name', 'author', 'date', 'title', 'modified', * specific `$meta_query` clause, use that clause's array key.
* 'menu_order', 'parent', 'ID', 'rand', 'comment_count'. * Default 'date'. Accepts 'none', 'name', 'author', 'date',
* 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand',
* 'comment_count', 'meta_value', 'meta_value_num', and the
* array keys of `$meta_query`.
* @type int $p Post ID. * @type int $p Post ID.
* @type int $page Show the number of posts that would show up on page X of a * @type int $page Show the number of posts that would show up on page X of a
* static front page. * static front page.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31339'; $wp_version = '4.2-alpha-31340';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.