Merge pull request #3325 from boboldehampsink/patch-6

Use subquery in hasVariant & hasProduct criteria to improve performance
craftcms · Nov 10, 2023 · 877a045 · 877a045
2 parents fbd68ad + a18d57b
commit 877a045
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/elements/db/ProductQuery.php b/src/elements/db/ProductQuery.php
@@ -1126,12 +1126,11 @@ private function _applyHasVariantParam(): void
 
         $variantQuery->limit = null;
         $variantQuery->select('commerce_variants.productId');
-        $productIds = $variantQuery->asArray()->column();
 
         // Remove any blank product IDs (if any)
-        $productIds = array_filter($productIds);
+        $variantQuery->andWhere(['not', ['commerce_variants.productId' => null]]);
 
-        $this->subQuery->andWhere(['commerce_products.id' => array_values($productIds)]);
+        $this->subQuery->andWhere(['commerce_products.id' => $variantQuery]);
     }
 
     /**

diff --git a/src/elements/db/VariantQuery.php b/src/elements/db/VariantQuery.php
@@ -927,11 +927,11 @@ private function _applyHasProductParam(): void
 
         $productQuery->limit = null;
         $productQuery->select('commerce_products.id');
-        $productIds = $productQuery->column();
 
         // Remove any blank product IDs (if any)
-        $productIds = array_filter($productIds);
-        $this->subQuery->andWhere(['commerce_variants.productId' => $productIds]);
+        $productQuery->andWhere(['not', ['commerce_products.id' => null]]);
+
+        $this->subQuery->andWhere(['commerce_variants.productId' => $productQuery]);
     }
 
     /**