Changeset 31340 for trunk/tests/phpunit/tests/query/metaQuery.php

Timestamp:

02/05/2015 07:37:47 PM (12 years ago)

Author:

boonebgorges

Message:

Modify `meta_query orderby syntax to use array keys as clause "handles".

The implementation of meta_query orderby introduced in [31312] put clause
identifiers into a 'name' parameter of the clause. For greater clarity, this
changeset updates the syntax to use the associative array key used when
defining meta_query parameters, instead of the 'name' parameter.

Props Funkatronic, DrewAPicture.
Fixes #31045.

File:

• trunk/tests/phpunit/tests/query/metaQuery.php (modified) (9 diffs)

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

@@ -1563 +1563 @@
          * @ticket 31045
          */
-        public function test_orderby_name() {
+        public function test_orderby_clause_key() {
                 $posts = $this->factory->post->create_many( 3 );
                 add_post_meta( $posts[0], 'foo', 'aaa' );
@@ -1572 +1572 @@
                         'fields' => 'ids',
                         'meta_query' => array(
-                                array(
-                                        'name' => 'foo_name',
+                                'foo_key' => array(
                                         'key' => 'foo',
                                         'compare' => 'EXISTS',
                                 ),
                         ),
-                        'orderby' => 'foo_name',
+                        'orderby' => 'foo_key',
                         'order' => 'DESC',
                 ) );
@@ -1588 +1587 @@
          * @ticket 31045
          */
-        public function test_orderby_name_as_secondary_sort() {
+        public function test_orderby_clause_key_as_secondary_sort() {
                 $p1 = $this->factory->post->create( array(
                         'post_date' => '2015-01-28 03:00:00',
@@ -1606 +1605 @@
                         'fields' => 'ids',
                         'meta_query' => array(
-                                array(
-                                        'name' => 'foo_name',
+                                'foo_key' => array(
                                         'key' => 'foo',
                                         'compare' => 'EXISTS',
@@ -1614 +1612 @@
                         'orderby' => array(
                                 'post_date' => 'asc',
-                                'foo_name' => 'asc',
+                                'foo_key' => 'asc',
                         ),
                 ) );
@@ -1624 +1622 @@
          * @ticket 31045
          */
-        public function test_orderby_more_than_one_name() {
+        public function test_orderby_more_than_one_clause_key() {
                 $posts = $this->factory->post->create_many( 3 );
 
@@ -1637 +1635 @@
                         'fields' => 'ids',
                         'meta_query' => array(
-                                array(
-                                        'name' => 'foo_name',
+                                'foo_key' => array(
                                         'key' => 'foo',
                                         'compare' => 'EXISTS',
                                 ),
-                                array(
-                                        'name' => 'bar_name',
+                                'bar_key' => array(
                                         'key' => 'bar',
                                         'compare' => 'EXISTS',
@@ -1649 +1645 @@
                         ),
                         'orderby' => array(
-                                'foo_name' => 'asc',
-                                'bar_name' => 'desc',
+                                'foo_key' => 'asc',
+                                'bar_key' => 'desc',
                         ),
                 ) );
@@ -1656 +1652 @@
                 $this->assertEquals( array( $posts[2], $posts[0], $posts[1] ), $q->posts );
         }
+
+        /**
+         * @ticket 31045
+         */
+        public function test_duplicate_clause_keys_should_be_made_unique() {
+                $q = new WP_Query( array(
+                        'fields' => 'ids',
+                        'meta_query' => array(
+                                'foo_key' => array(
+                                        'key' => 'foo',
+                                        'compare' => 'EXISTS',
+                                ),
+                                array(
+                                        'foo_key' => array(
+                                                'key' => 'bar',
+                                                'compare' => 'EXISTS',
+                                        ),
+                                ),
+                                array(
+                                        'foo_key' => array(
+                                                'key' => 'baz',
+                                                'compare' => 'EXISTS',
+                                        ),
+                                ),
+                        ),
+                ) );
+
+                $this->assertEqualSets( array( 'foo_key', 'foo_key-1', 'foo_key-2' ), array_keys( $q->meta_query->get_clauses() ) );
+        }
 }