Fixed #3758 variant query performance

craftcms · Nov 13, 2024 · 46cc29d · 46cc29d
1 parent 83b9a4c
commit 46cc29d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Fixed a variant query performance degradation bug. ([#3758](https://github.com/craftcms/commerce/issues/3758))
 - Fixed a bug where purchasables were showing incorrectly on the Edit Order screen. ([#3756](https://github.com/craftcms/commerce/issues/3756))
 
 ## 5.2.2.1 - 2024-11-08

diff --git a/src/elements/Variant.php b/src/elements/Variant.php
@@ -427,6 +427,17 @@ public function attributes(): array
      */
     public function getFieldLayout(): ?FieldLayout
     {
+        $fieldLayout = parent::getFieldLayout();
+
+        if ($fieldLayout) {
+            // Variant field layouts are stored on the product type so retrieving the field layout by ID does not set the provider
+            $productType = collect(Plugin::getInstance()->getProductTypes()->getAllProductTypes())->firstWhere('variantFieldLayoutId', $fieldLayout->id);
+            if ($productType) {
+                $fieldLayout->provider = $productType;
+                return $fieldLayout;
+            }
+        }
+
         try {
             if ($this->getOwner() === null) {
                 return parent::getFieldLayout();