Ticket #16814: 16814.2.diff

src/wp-includes/query.php

@@ -2223 +2223 @@
                         'parent', 'type', 'ID', 'menu_order', 'comment_count', 'rand',
                 );
 
-                $meta_key = $this->get( 'meta_key' );
-                if ( ! empty( $meta_key ) ) {
-                        $allowed_keys[] = $meta_key;
+                $meta_key = '';
+                $primary_meta_query = false;
+                if ( ! empty( $this->meta_query->queries ) ) {
+                        $meta_query = reset( $this->meta_query->queries );
+
+                        if ( ! empty( $meta_query['key'] ) ) {
+                                $meta_key = $meta_query['key'];
+                                $allowed_keys[] = $meta_query['key'];
+                        }
+
                         $allowed_keys[] = 'meta_value';
                         $allowed_keys[] = 'meta_value_num';
                 }
@@ -2252 +2259 @@
                                 break;
                         case $meta_key:
                         case 'meta_value':
-                                $type = $this->get( 'meta_type' );
-                                if ( ! empty( $type ) ) {
-                                        $meta_type = $this->meta_query->get_cast_for_type( $type );
+                                if ( ! empty( $meta_query['type'] ) ) {
+                                        $meta_type = $this->meta_query->get_cast_for_type( $meta_query['type'] );
                                         $orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})";
                                 } else {
                                         $orderby = "$wpdb->postmeta.meta_value";

tests/phpunit/tests/meta.php

@@ -162 +162 @@
                 $this->assertEquals( $expected2, get_metadata( 'user', $this->author->ID, $key, true ) );
         }
 
+        /**
+         * @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(
                         'fields' => 'ids',
@@ -181 +186 @@
 
                 $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(' ) );
         }
 
         function test_meta_cache_order_asc() {