Merge branch '5.x' of github.com:craftcms/commerce into 5.x

Author: lukeholder

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+- Fixed a bug where newly created variants weren’t visible on Edit product screens. 
+- Fixed a SQL error that could occur when viewing product indexes. 
+
 ## 5.5.0.1 - 2025-11-24
 
 - Fixed an error that could occur when querying for products via GraphQL. ([#4122](https://github.com/craftcms/commerce/issues/4122)) 

src/elements/Variant.php

@@ -715,9 +715,19 @@ public function updateSku(Product $product): void
      */
     protected function cacheTags(): array
     {
-        return [
-            "product:$this->primaryOwnerId",
-        ];
+        $tags = [];
+
+        if ($primaryOwnerId = $this->getPrimaryOwnerId()) {
+            $tags[] = "element::{$primaryOwnerId}";
+            $tags[] = "product:{$primaryOwnerId}";
+        }
+
+        $ownerId = $this->getOwnerId();
+        if ($ownerId && $ownerId !== $primaryOwnerId) {
+            $tags[] = "element::{$ownerId}";
+        }
+
+        return $tags;
     }
 
     /**
@@ -1181,7 +1191,7 @@ public function beforeSave(bool $isNew): bool
         // Validate shipping category ID is available for this product type
         $availableShippingCategories = $this->availableShippingCategories();
         $availableShippingCategoryIds = ArrayHelper::getColumn($availableShippingCategories, 'id');
-        
+
         // If the current shipping category ID is not in the available categories, set it to the default one
         $currentShippingCategoryId = $this->getShippingCategoryId();
         if (!in_array($currentShippingCategoryId, $availableShippingCategoryIds)) {

src/elements/db/VariantQuery.php

@@ -20,6 +20,7 @@
 use craft\db\Query;
 use craft\db\QueryAbortedException;
 use craft\db\Table as CraftTable;
+use craft\elements\db\NestedElementQueryTrait;
 use craft\helpers\ArrayHelper;
 use craft\helpers\Db;
 use craft\helpers\StringHelper;
@@ -56,6 +57,9 @@
  */
 class VariantQuery extends PurchasableQuery
 {
+    use NestedElementQueryTrait {
+        cacheTags as nestedTraitCacheTags;
+    }
     /**
      * @inheritdoc
      */
@@ -484,7 +488,7 @@ protected function beforePrepare(): bool
         // Forcing the use of the `sortOrder` index if no custom `orderBy` is set
         if ($sortOrderIndex !== null && empty($this->orderBy)) {
             $elementOwnersTable = Craft::$app->getDb()->schema->getRawTableName(\craft\db\Table::ELEMENTS_OWNERS);
-            $this->subQuery->innerJoin([new Expression('[['.$elementOwnersTable.']] AS elements_owners USE INDEX (' . $sortOrderIndex . ')')], $ownersCondition);
+            $this->subQuery->innerJoin([new Expression('[[' . $elementOwnersTable . ']] AS elements_owners USE INDEX (' . $sortOrderIndex . ')')], $ownersCondition);
         } else {
             $this->subQuery->innerJoin(['elements_owners' => CraftTable::ELEMENTS_OWNERS], $ownersCondition);
         }
@@ -874,6 +878,8 @@ protected function cacheTags(): array
             }
         }
 
+        array_push($tags, ...$this->nestedTraitCacheTags());
+
         return $tags;
     }
 }