Run scalar element queries on the built subquery

brandonkelly · brandonkelly · commit 0ff4796abd9d · 2024-03-15T03:46:47.000-07:00
Avoids unnecessary overhead when we’re not actually fetching the full element results, or applying ORDER BY, etc.
diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
@@ -12,3 +12,4 @@
 
 ### System
 - Craft now calls `setlocale()` based on the target language, so that `SORT_LOCALE_STRING` behaves as expected. ([#14509](https://github.com/craftcms/cms/issues/14509), [#14513](https://github.com/craftcms/cms/pull/14513))
+- Improved the performance of scalar element queries like `count()`.
diff --git a/src/elements/db/ElementQuery.php b/src/elements/db/ElementQuery.php
@@ -1569,11 +1569,47 @@ public function afterPopulate(array $elements): array
     public function count($q = '*', $db = null): bool|int|string|null
     {
         // Cached?
-        if (($cachedResult = $this->getCachedResult()) !== null) {
+        if (
+            !$this->offset &
+            !$this->limit &
+            ($cachedResult = $this->getCachedResult()) !== null
+        ) {
             return count($cachedResult);
         }
 
-        return parent::count($q, $db) ?: 0;
+        return $this->prepareSubquery()->count($q, $db) ?: 0;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function sum($q, $db = null)
+    {
+        return $this->prepareSubquery()->sum($q, $db);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function average($q, $db = null)
+    {
+        return $this->prepareSubquery()->average($q, $db);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function min($q, $db = null)
+    {
+        return $this->prepareSubquery()->min($q, $db);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function max($q, $db = null)
+    {
+        return $this->prepareSubquery()->max($q, $db);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,4 @@`
`12`	`12`
`13`	`13`	`### System`
`14`	`14`	- Craft now calls `setlocale()` based on the target language, so that `SORT_LOCALE_STRING` behaves as expected. ([#14509](https://github.com/craftcms/cms/issues/14509), [#14513](https://github.com/craftcms/cms/pull/14513))
	`15`	+- Improved the performance of scalar element queries like `count()`.