Changeset 46188

Timestamp:

09/19/2019 03:02:20 PM (5 years ago)

Author:

boonebgorges

Message:

Query: Expand the list of operators available to compare_key in WP_Meta_Query.

compare_key, introduced in #42409, previously supported only = and LIKE
operators. This changeset introduces a number of other operators: !=, IN,
NOT IN, NOT LIKE, RLIKE, REGEXP, NOT REGEXP, EXISTS, and NOT EXISTS
(the latter two aliased to = and !=, respectively). To support case-sensitive
regular expression key comparisons, the new type_key parameter will force
a MySQL CAST when 'BINARY' is passed.

Props soulseekah.
Fixes #43346.

Location:

trunk

Files:

• src/wp-includes/class-wp-meta-query.php (modified) (5 diffs)
• src/wp-includes/class-wp-query.php (modified) (2 diffs)
• tests/phpunit/tests/meta/query.php (modified) (1 diff)
• tests/phpunit/tests/query/metaQuery.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-meta-query.php

@@ -101 +101 @@
      * @since 4.2.0 Introduced support for naming query clauses by associative array keys.
      * @since 5.1.0 Introduced $compare_key clause parameter, which enables LIKE key matches.
+
+
      *
      * @param array $meta_query {
@@ -112 +114 @@
      *
      *         @type string $key         Meta key to filter by.
-     *         @type string $compare_key MySQL operator used for comparing the $key. Accepts '=' and 'LIKE'.
-     *                                   Default '='.
+     *         @type string $compare_key MySQL operator used for comparing the $key. Accepts '=', '!='
+     *                                   'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'REGEXP', 'NOT REGEXP', 'RLIKE',
+     *                                   'EXISTS' (alias of '=') or 'NOT EXISTS' (alias of '!=').
+     *                                   Default is 'IN' when `$key` is an array, '=' otherwise.
+     *         @type string $type_key    MySQL data type that the meta_key column will be CAST to for
+     *                                   comparisons. Accepts 'BINARY' for case-sensitive regular expression
+     *                                   comparisons. Default is ''.
      *         @type string $value       Meta value to filter by.
      *         @type string $compare     MySQL operator used for comparing the $value. Accepts '=',
@@ -240 +247 @@
          */
         $primary_meta_query = array();
-        foreach ( array( 'key', 'compare', 'type', 'compare_key' ) as $key ) {
+        foreach ( array( 'key', 'compare', 'type', 'compare_key' ) as $key ) {
             if ( ! empty( $qv[ "meta_$key" ] ) ) {
                 $primary_meta_query[ $key ] = $qv[ "meta_$key" ];
@@ -499 +506 @@
         }
 
-        if ( ! in_array(
-            $clause['compare'],
-            array(
-                '=',
-                '!=',
-                '>',
-                '>=',
-                '<',
-                '<=',
-                'LIKE',
-                'NOT LIKE',
-                'IN',
-                'NOT IN',
-                'BETWEEN',
-                'NOT BETWEEN',
-                'EXISTS',
-                'NOT EXISTS',
-                'REGEXP',
-                'NOT REGEXP',
-                'RLIKE',
-            )
-        ) ) {
+        $non_numeric_operators = array(
+            '=',
+            '!=',
+            'LIKE',
+            'NOT LIKE',
+            'IN',
+            'NOT IN',
+            'EXISTS',
+            'NOT EXISTS',
+            'RLIKE',
+            'REGEXP',
+            'NOT REGEXP',
+        );
+
+        $numeric_operators = array(
+            '>',
+            '>=',
+            '<',
+            '<=',
+            'BETWEEN',
+            'NOT BETWEEN',
+        );
+
+        if ( ! in_array( $clause['compare'], $non_numeric_operators, true ) && ! in_array( $clause['compare'], $numeric_operators, true ) ) {
             $clause['compare'] = '=';
         }
 
-        if ( isset( $clause['compare_key'] ) && 'LIKE' === strtoupper( $clause['compare_key'] ) ) {
+        if ( isset( $clause['compare_key'] ) ) {
             $clause['compare_key'] = strtoupper( $clause['compare_key'] );
         } else {
+
+
+
+
             $clause['compare_key'] = '=';
         }
@@ -595 +608 @@
                 $sql_chunks['where'][] = $alias . '.' . $this->meta_id_column . ' IS NULL';
             } else {
-                if ( 'LIKE' === $meta_compare_key ) {
-                    $sql_chunks['where'][] = $wpdb->prepare( "$alias.meta_key LIKE %s", '%' . $wpdb->esc_like( trim( $clause['key'] ) ) . '%' );
-                } else {
-                    $sql_chunks['where'][] = $wpdb->prepare( "$alias.meta_key = %s", trim( $clause['key'] ) );
+                /**
+                 * In joined clauses negative operators have to be nested into a
+                 * NOT EXISTS clause and flipped, to avoid returning records with
+                 * matching post IDs but different meta keys. Here we prepare the
+                 * nested clause.
+                 */
+                if ( in_array( $meta_compare_key, array( '!=', 'NOT IN', 'NOT LIKE', 'NOT EXISTS', 'NOT REGEXP' ), true ) ) {
+                    // Negative clauses may be reused.
+                    $i                     = count( $this->table_aliases );
+                    $subquery_alias        = $i ? 'mt' . $i : $this->meta_table;
+                    $this->table_aliases[] = $subquery_alias;
+
+                    $meta_compare_string_start  = 'NOT EXISTS (';
+                    $meta_compare_string_start .= "SELECT 1 FROM $wpdb->postmeta $subquery_alias ";
+                    $meta_compare_string_start .= "WHERE $subquery_alias.post_ID = $alias.post_ID ";
+                    $meta_compare_string_end    = 'LIMIT 1';
+                    $meta_compare_string_end   .= ')';
                 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             }
         }

trunk/src/wp-includes/class-wp-query.php

@@ -615 +615 @@
      * @since 4.9.0 Introduced the `$comment_count` parameter.
      * @since 5.1.0 Introduced the `$meta_compare_key` parameter.
+
      *
      * @param string|array $query {
@@ -656 +657 @@
      *     @type string       $meta_value              Custom field value.
      *     @type int          $meta_value_num          Custom field value number.
+
      *     @type int          $menu_order              The menu order of the posts.
      *     @type int          $monthnum                The two-digit month. Default empty. Accepts numbers 1-12.

trunk/tests/phpunit/tests/meta/query.php

@@ -739 +739 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * This is the clause that ensures that empty arrays are not valid queries.
      */

trunk/tests/phpunit/tests/query/metaQuery.php

@@ -1923 +1923 @@
 
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }