Ticket #42907: 42907.diff

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

@@ -236 +236 @@
                  * the rest of the meta_query).
                  */
                 $primary_meta_query = array();
-                foreach ( array( 'key', 'compare', 'type' ) as $key ) {
+                foreach ( array( 'key', 'compare', 'type', 'default' ) as $key ) {
                         if ( ! empty( $qv[ "meta_$key" ] ) ) {
                                 $primary_meta_query[ $key ] = $qv[ "meta_$key" ];
                         }
@@ -513 +513 @@
                                 'REGEXP',
                                 'NOT REGEXP',
                                 'RLIKE',
+                                'NONE',
                         )
                 ) ) {
                         $clause['compare'] = '=';
@@ -530 +531 @@
                         $alias = $i ? 'mt' . $i : $this->meta_table;
 
                         // JOIN clauses for NOT EXISTS have their own syntax.
-                        if ( 'NOT EXISTS' === $meta_compare ) {
+                        if ( 'NONE' === $meta_compare ) {
                                 $join .= " LEFT JOIN $this->meta_table";
                                 $join .= $i ? " AS $alias" : '';
                                 $join .= $wpdb->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] );
 
                                 // All other JOIN clauses.
+                        } elseif ( 'NOT EXISTS' === $meta_compare ) {
+                                $join .= " LEFT JOIN $this->meta_table";
+                                $join .= $i ? " AS $alias" : '';
+                                $join .= $wpdb->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] );
+
+                                // All other JOIN clauses.
                         } else {
                                 $join .= " INNER JOIN $this->meta_table";
                                 $join .= $i ? " AS $alias" : '';
@@ -576 +583 @@
                 if ( array_key_exists( 'key', $clause ) ) {
                         if ( 'NOT EXISTS' === $meta_compare ) {
                                 $sql_chunks['where'][] = $alias . '.' . $this->meta_id_column . ' IS NULL';
-                        } else {
+                        } elseif ( 'NONE' !== $meta_compare ) {
                                 $sql_chunks['where'][] = $wpdb->prepare( "$alias.meta_key = %s", trim( $clause['key'] ) );
                         }
                 }
@@ -620 +627 @@
 
                                 // 'value' is ignored for NOT EXISTS.
                                 case 'NOT EXISTS':
+                                case 'NONE':
                                         $where = '';
                                         break;
 

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

@@ -1594 +1594 @@
                                 } else {
                                         $orderby_clause = "{$primary_meta_query['alias']}.meta_value";
                                 }
+                                if ( isset( $primary_meta_query['default'] ) ) {
+                                        $orderby_clause = $wpdb->prepare( "COALESCE({$orderby_clause},%s)", $primary_meta_query['default'] );
+                                }
                                 break;
                         case 'meta_value_num':
                                 $orderby_clause = "{$primary_meta_query['alias']}.meta_value+0";
+                                if ( isset( $primary_meta_query['default'] ) ) {
+                                        $orderby_clause = $wpdb->prepare( "COALESCE({$orderby_clause},%d)", $primary_meta_query['default'] );
+                                }
                                 break;
                         default:
                                 if ( array_key_exists( $orderby, $meta_clauses ) ) {

tests/phpunit/tests/meta/query.php

@@ -894 +894 @@
                 $this->assertNotContains( "{$wpdb->postmeta}.post_id IS NULL", $sql['where'] );
         }
 
+        public function test_compare_none() {
+                global $wpdb;
+
+                $query = new WP_Meta_Query(
+                        array(
+                                array(
+                                        'key'     => 'test',
+                                        'compare' => 'NONE',
+                                ),
+                        )
+                );
+
+                $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
+
+                $this->assertSame( " LEFT JOIN {$wpdb->postmeta} ON ({$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = 'test' )", $sql['join'] );
+                $this->assertEmpty( $sql['where'] );
+        }
+
         /**
          * @ticket 32592
          */