Changeset 29855

Timestamp:

10/08/2014 03:11:14 PM (10 years ago)

Author:

kovshenin

Message:

Use the primary meta_query clause when parsing orderby in WP_Query.

When using legacy meta_key, meta_value, etc. arguments in WP_Query,
they're converted into the first clause of a meta_query. By using that
clause instead of the original arguments, we make sure that behavior is
consistent between the two available formats.

props boonebgorges.
fixes #16814.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (2 diffs)
• tests/phpunit/tests/meta.php (modified) (2 diffs)

trunk/src/wp-includes/query.php

@@ -2224 +2224 @@
         );
 
-        $meta_key = $this->get( 'meta_key' );
-        if ( ! empty( $meta_key ) ) {
-            $allowed_keys[] = $meta_key;
+        $primary_meta_key = '';
+        $primary_meta_query = false;
+        if ( ! empty( $this->meta_query->queries ) ) {
+            $primary_meta_query = reset( $this->meta_query->queries );
+
+            if ( ! empty( $primary_meta_query['key'] ) ) {
+                $primary_meta_key = $primary_meta_query['key'];
+                $allowed_keys[] = $primary_meta_key;
+            }
+
             $allowed_keys[] = 'meta_value';
             $allowed_keys[] = 'meta_value_num';
@@ -2251 +2258 @@
                 $orderby = 'RAND()';
                 break;
-            case $meta_key:
+            case $primary_meta_key:
             case 'meta_value':
-                $type = $this->get( 'meta_type' );
-                if ( ! empty( $type ) ) {
-                    $meta_type = $this->meta_query->get_cast_for_type( $type );
-                    $orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})";
+                if ( ! empty( $primary_meta_query['type'] ) ) {
+                    $sql_type = $this->meta_query->get_cast_for_type( $primary_meta_query['type'] );
+                    $orderby = "CAST($wpdb->postmeta.meta_value AS {$sql_type})";
                 } else {
                     $orderby = "$wpdb->postmeta.meta_value";

trunk/tests/phpunit/tests/meta.php

@@ -163 +163 @@
     }
 
+    /**
+     * @ticket 16814
+     */
     function test_meta_type_cast() {
         $post_id1 = $this->factory->post->create();
         add_post_meta( $post_id1, 'num_as_longtext', 123 );
+        add_post_meta( $post_id1, 'num_as_longtext_desc', 10 );
         $post_id2 = $this->factory->post->create();
         add_post_meta( $post_id2, 'num_as_longtext', 99 );
+        add_post_meta( $post_id2, 'num_as_longtext_desc', 100 );
 
         $posts = new WP_Query( array(
@@ -182 +187 @@
         $this->assertEquals( array( $post_id2, $post_id1 ), $posts->posts );
         $this->assertEquals( 2, substr_count( $posts->request, 'CAST(' ) );
+
+        // Make sure the newer meta_query syntax behaves in a consistent way
+        $posts = new WP_Query( array(
+            'fields' => 'ids',
+            'post_type' => 'any',
+            'meta_query' => array(
+                array(
+                    'key' => 'num_as_longtext',
+                    'value' => '0',
+                    'compare' => '>',
+                    'type' => 'UNSIGNED',
+                ),
+            ),
+            'orderby' => 'meta_value',
+            'order' => 'ASC'
+        ) );
+
+        $this->assertEquals( array( $post_id2, $post_id1 ), $posts->posts );
+        $this->assertEquals( 2, substr_count( $posts->request, 'CAST(' ) );
+
+        // The legacy `meta_key` value should take precedence.
+        $posts = new WP_Query( array(
+            'fields' => 'ids',
+            'post_type' => 'any',
+            'meta_key' => 'num_as_longtext',
+            'meta_compare' => '>',
+            'meta_type' => 'UNSIGNED',
+            'meta_query' => array(
+                array(
+                    'key' => 'num_as_longtext_desc',
+                    'value' => '0',
+                    'compare' => '>',
+                    'type' => 'UNSIGNED',
+                ),
+            ),
+            'orderby' => 'meta_value',
+            'order' => 'ASC'
+        ) );
+
+        $this->assertEquals( array( $post_id2, $post_id1 ), $posts->posts );
+        $this->assertEquals( 2, substr_count( $posts->request, 'CAST(' ) );
     }