Update Spree

Author: damianlegawiec

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/spree/spree.git
-  revision: 138a1ad5bc79fd25fc6abd3b7f4847d6719c0770
+  revision: fd9927c332b634699fee9f19fd400e7098f993b1
   branch: main
   specs:
     spree (5.0.0.alpha)
@@ -293,19 +293,19 @@ GEM
       csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (4.30.0)
+    google-protobuf (4.30.1)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.30.0-aarch64-linux)
+    google-protobuf (4.30.1-aarch64-linux)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.30.0-arm64-darwin)
+    google-protobuf (4.30.1-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.30.0-x86_64-darwin)
+    google-protobuf (4.30.1-x86_64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.30.0-x86_64-linux)
+    google-protobuf (4.30.1-x86_64-linux)
       bigdecimal
       rake (>= 13)
     groupdate (6.5.1)
@@ -368,7 +368,7 @@ GEM
     libv8-node (23.6.1.0-x86_64-darwin)
     libv8-node (23.6.1.0-x86_64-linux)
     libv8-node (23.6.1.0-x86_64-linux-musl)
-    local_time (3.0.2)
+    local_time (3.0.3)
     logger (1.6.6)
     loofah (2.24.0)
       crass (~> 1.0.2)

db/migrate/20250314114823_add_unique_index_on_promotion_rules_associations.spree.rb

@@ -0,0 +1,38 @@
+# This migration comes from spree (originally 20250312202705)
+class AddUniqueIndexOnPromotionRulesAssociations < ActiveRecord::Migration[7.2]
+  def change
+    # Remove duplicate product promotion rules
+    execute <<-SQL
+      DELETE FROM spree_product_promotion_rules
+      WHERE id NOT IN (
+        SELECT MIN(id)
+        FROM spree_product_promotion_rules
+        GROUP BY product_id, promotion_rule_id
+      );
+    SQL
+
+    # Remove duplicate taxon promotion rules
+    execute <<-SQL
+      DELETE FROM spree_promotion_rule_taxons
+      WHERE id NOT IN (
+        SELECT MIN(id)
+        FROM spree_promotion_rule_taxons
+        GROUP BY taxon_id, promotion_rule_id
+      );
+    SQL
+
+    # Remove duplicate user promotion rules
+    execute <<-SQL
+      DELETE FROM spree_promotion_rule_users
+      WHERE id NOT IN (
+        SELECT MIN(id)
+        FROM spree_promotion_rule_users
+        GROUP BY user_id, promotion_rule_id
+      );
+    SQL
+
+    add_index :spree_product_promotion_rules, [:product_id, :promotion_rule_id], unique: true
+    add_index :spree_promotion_rule_taxons, [:taxon_id, :promotion_rule_id], unique: true
+    add_index :spree_promotion_rule_users, [:user_id, :promotion_rule_id], unique: true
+  end
+end

db/migrate/20250314114824_add_user_type_to_spree_role_users.spree.rb

@@ -0,0 +1,19 @@
+# This migration comes from spree (originally 20250313104226)
+class AddUserTypeToSpreeRoleUsers < ActiveRecord::Migration[6.1]
+  def up
+    unless column_exists?(:spree_role_users, :user_type)
+      add_column :spree_role_users, :user_type, :string
+      add_index :spree_role_users, :user_type
+
+      user_class_name = Spree.admin_user_class.to_s
+      Spree::RoleUser.where(user_type: nil).update_all(user_type: user_class_name)
+
+      change_column_null :spree_role_users, :user_type, false
+    end
+  end
+
+  def down
+    remove_index :spree_role_users, :user_type, if_exists: true
+    remove_column :spree_role_users, :user_type, if_exists: true
+  end
+end

db/migrate/20250314114825_add_unique_index_on_promotion_action_line_items.spree.rb

@@ -0,0 +1,16 @@
+# This migration comes from spree (originally 20250313175830)
+class AddUniqueIndexOnPromotionActionLineItems < ActiveRecord::Migration[7.2]
+  def change
+    # Remove duplicate promotion action line items
+    execute <<-SQL
+      DELETE FROM spree_promotion_action_line_items
+      WHERE id NOT IN (
+        SELECT MIN(id)
+        FROM spree_promotion_action_line_items
+        GROUP BY promotion_action_id, variant_id
+      );
+    SQL
+
+    add_index :spree_promotion_action_line_items, [:promotion_action_id, :variant_id], unique: true
+  end
+end