Merge branch 'release/4.4.1'

Author: nfourtythree

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Notes for Craft Commerce
 
+## 4.4.1 - 2024-01-12
+
+- Fixed a SQL error that could occur when updating to Commerce 4.4.0 on MySQL. ([#3367](https://github.com/craftcms/commerce/issues/3367))
+- Fixed a PHP error that occurred when saving a discount. ([#3364](https://github.com/craftcms/commerce/issues/3364))
+
 ## 4.4.0 - 2024-01-11
 
 - Craft Commerce now requires Craft CMS 4.6.0 or later.

src/controllers/DiscountsController.php

@@ -239,7 +239,7 @@ public function actionSave(): ?Response
         $discount->perEmailLimit = (int)$this->request->getBodyParam('perEmailLimit');
         $discount->totalDiscountUseLimit = (int)$this->request->getBodyParam('totalDiscountUseLimit');
         $discount->ignoreSales = (bool)$this->request->getBodyParam('ignoreSales');
-        $discount->categoryRelationshipType = $this->request->getBodyParam('categoryRelationshipType');
+        $discount->categoryRelationshipType = $this->request->getBodyParam('categoryRelationshipType', $discount->categoryRelationshipType);
         $discount->baseDiscountType = $this->request->getBodyParam('baseDiscountType') ?: DiscountRecord::BASE_DISCOUNT_TYPE_VALUE;
         $discount->appliedTo = $this->request->getBodyParam('appliedTo') ?: DiscountRecord::APPLIED_TO_MATCHING_LINE_ITEMS;
         $discount->orderConditionFormula = $this->request->getBodyParam('orderConditionFormula');

src/services/Discounts.php

@@ -879,8 +879,12 @@ public function ensureSortOrder(): void
         } else {
             $sql = <<<SQL
 UPDATE $table a
-JOIN (SELECT id, [[sortOrder]], ROW_NUMBER() OVER (ORDER BY [[sortOrder]] ASC, id ASC) as rownumber
-FROM $table) b ON a.id = b.id
+JOIN (
+    SELECT id, [[sortOrder]], (@ROW_NUMBER := @ROW_NUMBER + 1) as rownumber
+    FROM $table,
+    (SELECT @ROW_NUMBER := 0) AS X
+    ORDER BY [[sortOrder]] ASC, id ASC    
+) b ON a.id = b.id
 SET [[a.sortOrder]] = b.rownumber
 SQL;
         }