Merge branch '5.x' into feature/support-with-fields-param-on-resave-a…

…ction

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Added the `--with-fields` option to all Commerce `resave/*` commands.
+- Fixed a SQL error that could occur when updating. ([#3778](https://github.com/craftcms/commerce/issues/3778))
 
 ## 5.2.4 - 2024-11-14
 

src/elements/db/OrderQuery.php

@@ -1599,7 +1599,6 @@ protected function beforePrepare(): bool
         }
 
         if (isset($this->reference) && $this->reference) {
-            // $this->subQuery->andWhere(['commerce_orders.reference' => $this->reference]);
             $this->subQuery->andWhere(Db::parseParam('commerce_orders.reference', $this->reference));
         }
 

src/fields/Products.php

@@ -36,6 +36,14 @@ public function __construct(array $config = [])
         parent::__construct($config);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public static function icon(): string
+    {
+        return 'tag';
+    }
+
     /**
      * @inheritdoc
      */

src/fields/Variants.php

@@ -35,6 +35,14 @@ public static function displayName(): string
         return Craft::t('commerce', 'Commerce Variants');
     }
 
+    /**
+     * @inheritdoc
+     */
+    public static function icon(): string
+    {
+        return 'tags';
+    }
+
     /**
      * @inheritdoc
      */

src/migrations/m240308_133451_tidy_shipping_categories.php

@@ -25,9 +25,9 @@ public function safeUp(): bool
 
         $this->dropForeignKeyIfExists(Table::SHIPPINGCATEGORIES, ['storeId']);
 
-        $this->addForeignKey(null, Table::SHIPPINGCATEGORIES, ['storeId'], Table::STORES, ['id'], 'CASCADE');
-
         $this->alterColumn(Table::SHIPPINGCATEGORIES, 'storeId', $this->integer()->notNull());
+
+        $this->addForeignKey(null, Table::SHIPPINGCATEGORIES, ['storeId'], Table::STORES, ['id'], 'CASCADE');
 
         return true;
     }

src/migrations/m240313_131445_tidy_shipping_methods.php

@@ -25,10 +25,10 @@ public function safeUp(): bool
 
         $this->dropForeignKeyIfExists(Table::SHIPPINGMETHODS, ['storeId']);
 
-        $this->addForeignKey(null, Table::SHIPPINGMETHODS, ['storeId'], Table::STORES, ['id'], 'CASCADE');
-
         $this->alterColumn(Table::SHIPPINGMETHODS, 'storeId', $this->integer()->notNull());
 
+        $this->addForeignKey(null, Table::SHIPPINGMETHODS, ['storeId'], Table::STORES, ['id'], 'CASCADE');
+
         return true;
     }