Changeset 41059 for trunk/tests/phpunit/tests/multisite/siteQuery.php

Timestamp:

07/14/2017 09:24:03 PM (9 years ago)

Author:

flixos90

Message:

Multisite: Improve caching in WP_Site_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.

Props spacedmonkey.
Fixes #41197.

File:

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

trunk/tests/phpunit/tests/multisite/siteQuery.php

@@ -662 +662 @@
                 $this->assertEqualSets( $expected, $found );
         }
+
+        /**
+         * @ticket 41197
+         */
+        public function test_wp_site_query_cache_with_different_fields_no_count() {
+                global $wpdb;
+                $q                 = new WP_Site_Query();
+                $query_1           = $q->query( array(
+                        'fields'     => 'all',
+                        'network_id' => self::$network_ids['wordpress.org/'],
+                        'number'     => 3,
+                        'order'      => 'ASC',
+                ) );
+                $number_of_queries = $wpdb->num_queries;
+
+                $query_2 = $q->query( array(
+                        'fields'     => 'ids',
+                        'network_id' => self::$network_ids['wordpress.org/'],
+                        'number'     => 3,
+                        'order'      => 'ASC',
+                ) );
+
+                $this->assertEquals( $number_of_queries, $wpdb->num_queries );
+        }
+
+        /**
+         * @ticket 41197
+         */
+        public function test_wp_site_query_cache_with_different_fields_active_count() {
+                global $wpdb;
+                $q                 = new WP_Site_Query();
+
+                $query_1 = $q->query( array(
+                        'fields'     => 'all',
+                        'network_id' => self::$network_ids['wordpress.org/'],
+                        'number'     => 3,
+                        'order'      => 'ASC',
+                        'count'      => true,
+                ) );
+                $number_of_queries = $wpdb->num_queries;
+
+                $query_2 = $q->query( array(
+                        'fields'     => 'ids',
+                        'network_id' => self::$network_ids['wordpress.org/'],
+                        'number'     => 3,
+                        'order'      => 'ASC',
+                        'count'      => true,
+                ) );
+                $this->assertEquals( $number_of_queries, $wpdb->num_queries );
+        }
+
+        /**
+         * @ticket 41197
+         */
+        public function test_wp_site_query_cache_with_same_fields_different_count() {
+                global $wpdb;
+                $q = new WP_Site_Query();
+
+                $query_1 = $q->query( array(
+                        'fields'     => 'ids',
+                        'network_id' => self::$network_ids['wordpress.org/'],
+                        'number'     => 3,
+                        'order'      => 'ASC',
+                ) );
+
+                $number_of_queries = $wpdb->num_queries;
+
+                $query_2 = $q->query( array(
+                        'fields'     => 'ids',
+                        'network_id' => self::$network_ids['wordpress.org/'],
+                        'number'     => 3,
+                        'order'      => 'ASC',
+                        'count'      => true,
+                ) );
+                $this->assertEquals( $number_of_queries + 1, $wpdb->num_queries );
+        }
 }