Changeset 28659

Timestamp:

06/04/2014 05:47:19 AM (10 years ago)

Author:

wonderboymusic

Message:

Fix SQL generation when meta_query has an 'relation' => 'OR' for its queries and wants to 'orderby' => 'meta_value'.

Adds unit test.

Props jackreichert.
Fixes #25538.

Location:

trunk

Files:

• src/wp-includes/meta.php (modified) (3 diffs)
• tests/phpunit/tests/meta.php (modified) (1 diff)

trunk/src/wp-includes/meta.php

@@ -973 +973 @@
         }
 
+        $where_meta_key = array();
         foreach ( $queries as $k => $q ) {
             $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
@@ -1015 +1016 @@
 
             $where[$k] = '';
-            if ( !empty( $meta_key ) )
-                $where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
+            if ( ! empty( $meta_key ) ) {
+                if ( isset( $q['compare'] ) ) {
+                    $where_meta_key[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
+                } else {
+                    $where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
+                }
+            }
 
             if ( is_null( $meta_value ) ) {
-                if ( empty( $where[$k] ) )
+                if ( empty( $where[$k] ) && empty( $where_meta_key ) ) {
                     unset( $join[$i] );
+                }
                 continue;
             }
@@ -1060 +1067 @@
         else
             $where = ' AND (' . implode( "\n{$this->relation} ", $where ) . ' )';
+
+        if ( ! empty( $where_meta_key ) ) {
+            $where .= "\nAND " . implode( "\nAND ", $where_meta_key );
+        }
 
         $join = implode( "\n", $join );

trunk/tests/phpunit/tests/meta.php

@@ -198 +198 @@
         }
     }
+
+    function test_query_meta_query_order() {
+        $post1 = $this->factory->post->create( array( 'post_title' => 'meta-value-1', 'post_date' => '2007-01-01 00:00:00' ) );
+        $post2 = $this->factory->post->create( array( 'post_title' => 'meta-value-2', 'post_date' => '2007-01-01 00:00:00' ) );
+        $post3 = $this->factory->post->create( array( 'post_title' => 'meta-value-3', 'post_date' => '2007-01-01 00:00:00' ) );
+
+        add_post_meta( $post1, 'order', 1 );
+        add_post_meta( $post2, 'order', 2 );
+        add_post_meta( $post3, 'order', 3 );
+
+        $args = array(
+            'post_type' => 'post',
+            'meta_key' => 'order',
+            'meta_value' => 1,
+            'meta_compare' => '>=',
+            'orderby' => 'meta_value'
+        );
+
+        $args2 = array(
+            'post_type' => 'post',
+            'meta_key' => 'order',
+            'meta_value' => 1,
+            'meta_compare' => '>=',
+            'orderby' => 'meta_value',
+            'meta_query' => array(
+                'relation' => 'OR',
+                array(
+                    'key' => 'order',
+                    'compare' => '>=',
+                    'value' => 1
+                )
+            )
+        );
+
+        $posts = get_posts( $args );
+        $posts2 = get_posts( $args2 );
+
+        $this->assertEquals( wp_list_pluck( $posts, 'post_title' ), wp_list_pluck( $posts2, 'post_title' ) );
+    }
 }