Changeset 41063 for trunk/tests/phpunit/tests/multisite/networkQuery.php

Timestamp:

07/17/2017 08:15:27 PM (8 years ago)

Author:

flixos90

Message:

Multisite: Improve caching in WP_Network_Query by ignoring the $fields argument.

Prior to this change there were two different cache keys used for the same query. That is because regardless of the $fields argument, the query response will be the same. This was already fixed for WP_Site_Query in [41059].

Props spacedmonkey.
Fixes #41347.

File:

• trunk/tests/phpunit/tests/multisite/networkQuery.php (modified) (1 diff)

trunk/tests/phpunit/tests/multisite/networkQuery.php

@@ -380 +380 @@
         $this->assertEquals( $expected, $found );
     }
+
+    /**
+     * @ticket 41347
+     */
+    public function test_wp_network_query_cache_with_different_fields_no_count() {
+        global $wpdb;
+
+        $q                 = new WP_Network_Query();
+        $query_1           = $q->query( array(
+            'fields'     => 'all',
+            'number'     => 3,
+            'order'      => 'ASC',
+        ) );
+        $number_of_queries = $wpdb->num_queries;
+
+        $query_2 = $q->query( array(
+            'fields'     => 'ids',
+            'number'     => 3,
+            'order'      => 'ASC',
+        ) );
+
+        $this->assertEquals( $number_of_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @ticket 41347
+     */
+    public function test_wp_network_query_cache_with_different_fields_active_count() {
+        global $wpdb;
+
+        $q = new WP_Network_Query();
+
+        $query_1           = $q->query( array(
+            'fields'     => 'all',
+            'number'     => 3,
+            'order'      => 'ASC',
+            'count'      => true,
+        ) );
+        $number_of_queries = $wpdb->num_queries;
+
+        $query_2 = $q->query( array(
+            'fields'     => 'ids',
+            'number'     => 3,
+            'order'      => 'ASC',
+            'count'      => true,
+        ) );
+        $this->assertEquals( $number_of_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @ticket 41347
+     */
+    public function test_wp_network_query_cache_with_same_fields_different_count() {
+        global $wpdb;
+
+        $q = new WP_Network_Query();
+
+        $query_1 = $q->query( array(
+            'fields'     => 'ids',
+            'number'     => 3,
+            'order'      => 'ASC',
+        ) );
+
+        $number_of_queries = $wpdb->num_queries;
+
+        $query_2 = $q->query( array(
+            'fields'     => 'ids',
+            'number'     => 3,
+            'order'      => 'ASC',
+            'count'      => true,
+        ) );
+        $this->assertEquals( $number_of_queries + 1, $wpdb->num_queries );
+    }
 }