Wordpress 4.6

[autoinstalls/wordpress.git] / wp-includes / class-wp-meta-query.php

diff --git a/wp-includes/class-wp-meta-query.php b/wp-includes/class-wp-meta-query.php
index d9419e7a426d82a70318725f0b0aa85c565acae9..4019912019883967d6def5b40f8a27095444a3cd 100644 (file)
--- a/wp-includes/class-wp-meta-query.php
+++ b/wp-includes/class-wp-meta-query.php
@@ -12,7 +12,8 @@
  *
  * Used for generating SQL clauses that filter a primary query according to metadata keys and values.
  *
  *
  * Used for generating SQL clauses that filter a primary query according to metadata keys and values.
  *

- * `WP_Meta_Query` is a helper that allows primary query classes, such as {@see WP_Query} and {@see WP_User_Query},
+ * WP_Meta_Query is a helper that allows primary query classes, such as WP_Query and WP_User_Query,
+ *

  * to filter their results by object metadata, by generating `JOIN` and `WHERE` subclauses to be attached
  * to the primary SQL query string.
  *
  * to filter their results by object metadata, by generating `JOIN` and `WHERE` subclauses to be attached
  * to the primary SQL query string.
  *


@@ -24,7 +25,7 @@ class WP_Meta_Query {
        /**
         * Array of metadata queries.
         *
        /**
         * Array of metadata queries.
         *

-        * See {@see WP_Meta_Query::__construct()} for information on meta query arguments.
+        * See WP_Meta_Query::__construct() for information on meta query arguments.

         *
         * @since 3.2.0
         * @access public
         *
         * @since 3.2.0
         * @access public


@@ -113,8 +114,8 @@ class WP_Meta_Query {
         * @access public
         *
         * @param array $meta_query {
         * @access public
         *
         * @param array $meta_query {

-        *     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.
+        *     Array of meta query clauses. When first-order clauses or sub-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
         *                            the clauses of the query. Accepts 'AND', or 'OR'. Default 'AND'.
         *
         *     @type string $relation Optional. The MySQL keyword used to join
         *                            the clauses of the query. Accepts 'AND', or 'OR'. Default 'AND'.


@@ -124,8 +125,9 @@ class WP_Meta_Query {
         *         @type string $key     Meta key to filter by.
         *         @type string $value   Meta value to filter by.
         *         @type string $compare MySQL operator used for comparing the $value. Accepts '=',
         *         @type string $key     Meta key to filter by.
         *         @type string $value   Meta value to filter by.
         *         @type string $compare MySQL operator used for comparing the $value. Accepts '=',

-        *                               '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN',
-        *                               'BETWEEN', 'NOT BETWEEN', 'REGEXP', 'NOT REGEXP', or 'RLIKE'.
+        *                               '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE',
+        *                               'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN', 'REGEXP',
+        *                               'NOT REGEXP', 'RLIKE', 'EXISTS' or 'NOT EXISTS'.

         *                               Default is 'IN' when `$value` is an array, '=' otherwise.
         *         @type string $type    MySQL data type that the meta_value column will be CAST to for
         *                               comparisons. Accepts 'NUMERIC', 'BINARY', 'CHAR', 'DATE',
         *                               Default is 'IN' when `$value` is an array, '=' otherwise.
         *         @type string $type    MySQL data type that the meta_value column will be CAST to for
         *                               comparisons. Accepts 'NUMERIC', 'BINARY', 'CHAR', 'DATE',


@@ -325,6 +327,8 @@ class WP_Meta_Query {
                        return false;
                }
 
                        return false;
                }
 

+               $this->table_aliases = array();
+

                $this->meta_table     = $meta_table;
                $this->meta_id_column = sanitize_key( $type . '_id' );
 
                $this->meta_table     = $meta_table;
                $this->meta_id_column = sanitize_key( $type . '_id' );
 


@@ -342,20 +346,16 @@ class WP_Meta_Query {
                }
 
                /**
                }
 
                /**

-                * Filter the meta query's generated SQL.
+                * Filters the meta query's generated SQL.

                 *
                 * @since 3.1.0
                 *
                 *
                 * @since 3.1.0
                 *

-                * @param array $args {
-                *     An array of meta query SQL arguments.
-                *
-                *     @type array  $clauses           Array containing the query's JOIN and WHERE clauses.
-                *     @type array  $queries           Array of meta queries.
-                *     @type string $type              Type of meta.
-                *     @type string $primary_table     Primary table.
-                *     @type string $primary_id_column Primary column ID.
-                *     @type object $context           The main query object.
-                * }
+                * @param array  $clauses           Array containing the query's JOIN and WHERE clauses.
+                * @param array  $queries           Array of meta queries.
+                * @param string $type              Type of meta.
+                * @param string $primary_table     Primary table.
+                * @param string $primary_id_column Primary column ID.
+                * @param object $context           The main query object.

                 */
                return apply_filters_ref_array( 'get_meta_sql', array( $sql, $this->queries, $type, $primary_table, $primary_id_column, $context ) );
        }
                 */
                return apply_filters_ref_array( 'get_meta_sql', array( $sql, $this->queries, $type, $primary_table, $primary_id_column, $context ) );
        }


@@ -363,8 +363,8 @@ class WP_Meta_Query {
        /**
         * Generate SQL clauses to be appended to a main query.
         *
        /**
         * Generate SQL clauses to be appended to a main query.
         *

-        * Called by the public {@see WP_Meta_Query::get_sql()}, this method
-        * is abstracted out to maintain parity with the other Query classes.
+        * Called by the public WP_Meta_Query::get_sql(), this method is abstracted
+        * out to maintain parity with the other Query classes.

         *
         * @since 4.1.0
         * @access protected
         *
         * @since 4.1.0
         * @access protected


@@ -634,7 +634,11 @@ class WP_Meta_Query {
                        }
 
                        if ( $where ) {
                        }
 
                        if ( $where ) {

-                               $sql_chunks['where'][] = "CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$where}";
+                               if ( 'CHAR' === $meta_type ) {
+                                       $sql_chunks['where'][] = "$alias.meta_value {$meta_compare} {$where}";
+                               } else {
+                                       $sql_chunks['where'][] = "CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$where}";
+                               }

                        }
                }
 
                        }
                }
 


@@ -675,8 +679,8 @@ class WP_Meta_Query {
         * An existing alias is compatible if (a) it is a sibling of `$clause`
         * (ie, it's under the scope of the same relation), and (b) the combination
         * of operator and relation between the clauses allows for a shared table join.
         * An existing alias is compatible if (a) it is a sibling of `$clause`
         * (ie, it's under the scope of the same relation), and (b) the combination
         * of operator and relation between the clauses allows for a shared table join.

-        * In the case of {@see WP_Meta_Query}, this only applies to 'IN' clauses that
-        * are connected by the relation 'OR'.
+        * In the case of WP_Meta_Query, this only applies to 'IN' clauses that are
+        * connected by the relation 'OR'.

         *
         * @since 4.1.0
         * @access protected
         *
         * @since 4.1.0
         * @access protected


@@ -719,7 +723,7 @@ class WP_Meta_Query {
                }
 
                /**
                }
 
                /**

-                * Filter the table alias identified as compatible with the current clause.
+                * Filters the table alias identified as compatible with the current clause.

                 *
                 * @since 4.1.0
                 *
                 *
                 * @since 4.1.0
                 *