spree_core 5.1.8 → 5.2.0.rc2

data/db/migrate/20250728095629_create_spree_metafields.rb

@@ -0,0 +1,27 @@
+class CreateSpreeMetafields < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_metafield_definitions do |t|
+      t.string :namespace, null: false
+      t.string :key, null: false
+      t.string :name, null: false
+      t.string :metafield_type, null: false
+      t.string :resource_type, null: false, index: true
+      t.string :display_on, null: false, default: 'both', index: true
+      t.timestamps
+
+      t.index [:namespace, :key]
+      t.index [:resource_type, :namespace, :key], unique: true
+    end
+
+    create_table :spree_metafields do |t|
+      t.string :type, null: false, index: true
+      t.references :resource, polymorphic: true, null: false, index: true
+      t.references :metafield_definition, null: false, index: true
+      t.text :value
+
+      t.timestamps
+
+      t.index [:resource_type, :resource_id, :metafield_definition_id], name: 'index_metafields_on_resource_and_definition', unique: true
+    end
+  end
+end

data/db/migrate/20250730102644_add_missing_unique_indexes_to_spree_option_types_and_values.rb

@@ -0,0 +1,40 @@
+class AddMissingUniqueIndexesToSpreeOptionTypesAndValues < ActiveRecord::Migration[7.2]
+  def change
+    # we don't need to run this migration in multi-tenant mode as it's already handled there
+    return if defined?(SpreeMultiTenant)
+
+    # Rename duplicated option types
+    duplicates = Spree::OptionType.select(:name).group(:name).having('COUNT(*) > 1').reorder('').pluck(:name)
+
+    duplicates.each do |duplicate_name|
+      option_types = Spree::OptionType.where(name: duplicate_name)
+
+      option_types.each_with_index do |option_type, index|
+        next if index == 0 # Keep the first one unchanged
+
+        new_name = "#{duplicate_name}_#{index}"
+        option_type.update_columns(name: new_name, updated_at: Time.current)
+      end
+    end
+
+    # Handle duplicates in spree_option_values
+    duplicates = Spree::OptionValue.select(:option_type_id, :name).group(:option_type_id, :name).having('COUNT(*) > 1').reorder('')
+
+    duplicates.each do |dup|
+      option_values = Spree::OptionValue.where(option_type_id: dup.option_type_id, name: dup.name)
+
+      option_values.each_with_index do |option_value, index|
+        next if index == 0 # Keep the first one unchanged
+
+        new_name = "#{option_value.name}_#{index}"
+        option_value.update_columns(name: new_name, updated_at: Time.current)
+      end
+    end
+
+    # Add indexes
+    remove_index :spree_option_types, :name, if_exists: true
+    add_index :spree_option_types, :name, unique: true, if_not_exists: true
+
+    add_index :spree_option_values, %i[option_type_id name], unique: true, if_not_exists: true
+  end
+end

data/db/migrate/20250730154601_add_unique_index_on_spree_properties_name.rb

@@ -0,0 +1,24 @@
+class AddUniqueIndexOnSpreePropertiesName < ActiveRecord::Migration[7.2]
+  def change
+    # we don't need to run this migration in multi-tenant mode as it's already handled there
+    return if defined?(SpreeMultiTenant)
+
+    # Rename duplicated properties
+    duplicates = Spree::Property.select(:name).group(:name).having('COUNT(*) > 1').reorder('').pluck(:name)
+
+    duplicates.each do |duplicate_name|
+      properties = Spree::Property.where(name: duplicate_name)
+
+      properties.each_with_index do |property, index|
+        next if index == 0 # Keep the first one unchanged
+
+        new_name = "#{duplicate_name}_#{index}"
+        property.update_columns(name: new_name, updated_at: Time.current)
+      end
+    end
+
+    # Add indexes
+    remove_index :spree_properties, :name, if_exists: true
+    add_index :spree_properties, :name, unique: true, if_not_exists: true
+  end
+end

data/db/migrate/20250811112056_create_spree_policies.rb

@@ -0,0 +1,22 @@
+class CreateSpreePolicies < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_policies do |t|
+      t.belongs_to :store, null: false
+      t.string :slug, null: false
+      t.string :name, null: false
+
+      t.timestamps
+    end
+
+    add_index :spree_policies, [:store_id, :slug], unique: true
+    create_table :spree_policy_translations do |t|
+      t.string :locale, null: false
+      t.string :name
+      t.references :spree_policy, null: false
+
+      t.timestamps
+    end
+
+    add_index :spree_policy_translations, [:spree_policy_id, :locale], unique: true
+  end
+end

data/db/migrate/20250821211705_fix_unique_index_on_spree_order_promotions.rb

@@ -0,0 +1,20 @@
+class FixUniqueIndexOnSpreeOrderPromotions < ActiveRecord::Migration[7.2]
+  def change
+    remove_index :spree_order_promotions, name: 'index_spree_order_promotions_on_promotion_id_and_order_id', if_exists: true
+
+    # Remove duplicate records before adding unique index
+    duplicates = Spree::OrderPromotion.select(:promotion_id, :order_id).group(:promotion_id, :order_id).having('COUNT(*) > 1').reorder('').pluck(:promotion_id, :order_id)
+
+    duplicates.each do |duplicate_promotion_id, duplicate_order_id|
+      order_promotions = Spree::OrderPromotion.where(promotion_id: duplicate_promotion_id, order_id: duplicate_order_id)
+
+      order_promotions.each_with_index do |order_promotion, index|
+        next if index == 0 # Keep the first one unchanged
+
+        order_promotion.destroy
+      end
+    end
+
+    add_index :spree_order_promotions, [:promotion_id, :order_id], unique: true, name: 'index_spree_order_promotions_on_promotion_id_and_order_id'
+  end
+end

data/db/migrate/20250825175217_add_missing_page_builder_indexes.rb

@@ -0,0 +1,7 @@
+class AddMissingPageBuilderIndexes < ActiveRecord::Migration[7.2]
+  def change
+    add_index :spree_themes, %w[store_id default], name: 'index_spree_themes_on_store_id_and_default', if_not_exists: true
+    add_index :spree_page_links, %w[parent_type parent_id position], name: 'index_spree_page_links_parent_with_position', if_not_exists: true
+    add_index :spree_page_blocks, :deleted_at, if_not_exists: true
+  end
+end

data/db/migrate/20250826093602_create_spree_newsletter_subscribers.rb

@@ -0,0 +1,12 @@
+class CreateSpreeNewsletterSubscribers < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_newsletter_subscribers do |t|
+      t.string :email, index: { unique: true }, null: false
+      t.references :user, index: true
+      t.datetime :verified_at, index: true
+      t.string :verification_token, index: { unique: true }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250902143122_fix_policies_store_association.rb

@@ -0,0 +1,18 @@
+class FixPoliciesStoreAssociation < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :spree_policies, :owner, polymorphic: true, index: true
+
+    Spree::Policy.reset_column_information
+    Spree::Policy.all.each do |policy|
+      policy.update(owner_id: policy.store_id, owner_type: 'Spree::Store')
+    end
+
+    remove_index :spree_policies, [:store_id, :slug], unique: true, if_exists: true
+    remove_index :spree_policies, [:store_id, :position], if_exists: true
+    remove_column :spree_policies, :store_id, if_exists: true
+    remove_column :spree_policies, :show_in_checkout_footer, if_exists: true
+    remove_column :spree_policies, :position, if_exists: true
+
+    add_index :spree_policies, [:owner_id, :owner_type, :slug], unique: true
+  end
+end

data/db/migrate/20250911205659_add_missing_index_on_spree_products_promotionable.rb

@@ -0,0 +1,5 @@
+class AddMissingIndexOnSpreeProductsPromotionable < ActiveRecord::Migration[7.2]
+  def change
+    add_index :spree_products, :promotionable, if_not_exists: true
+  end
+end

data/db/migrate/20250913130044_add_page_links_counter_cache_to_spree_stores.rb

@@ -0,0 +1,10 @@
+class AddPageLinksCounterCacheToSpreeStores < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_stores, :page_links_count, :integer, default: 0, null: false
+
+    Spree::Store.reset_column_information
+    Spree::Store.find_each do |store|
+      Spree::Store.reset_counters(store.id, :links)
+    end
+  end
+end

data/db/migrate/20250914101955_add_missing_indexes_on_spree_adjustments.rb

@@ -0,0 +1,6 @@
+class AddMissingIndexesOnSpreeAdjustments < ActiveRecord::Migration[7.2]
+  def change
+    add_index :spree_adjustments, :source_type, if_not_exists: true
+    add_index :spree_adjustments, :amount, if_not_exists: true
+  end
+end

data/db/migrate/20250915093930_add_metadata_to_spree_newsletter_subscribers.rb

@@ -0,0 +1,20 @@
+class AddMetadataToSpreeNewsletterSubscribers < ActiveRecord::Migration[7.2]
+  def up
+    change_table :spree_newsletter_subscribers do |t|
+      if t.respond_to? :jsonb
+        t.jsonb :public_metadata
+        t.jsonb :private_metadata
+      else
+        t.json :public_metadata
+        t.json :private_metadata
+      end
+    end
+  end
+
+  def down
+    change_table :spree_newsletter_subscribers do |t|
+      t.remove :public_metadata
+      t.remove :private_metadata
+    end
+  end
+end

data/db/migrate/20250923141845_create_spree_imports.rb

@@ -0,0 +1,47 @@
+class CreateSpreeImports < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_imports do |t|
+      t.belongs_to :user, null: false
+      t.belongs_to :owner, polymorphic: true, null: false
+
+      t.string :status, null: false, index: true
+
+      t.string :number, limit: 32, null: false, index: { unique: true }
+      t.string :type, null: false, index: true
+
+      t.text :processing_errors
+
+      t.text :preferences
+
+      t.integer :rows_count, null: false, default: 0
+
+      t.timestamps
+    end
+
+    create_table :spree_import_rows do |t|
+      t.belongs_to :import, null: false
+      t.belongs_to :item, polymorphic: true
+
+      t.string :status, null: false, index: true
+      t.integer :row_number, null: false
+
+      t.text :data, null: false
+      t.text :validation_errors
+
+      t.timestamps
+    end
+
+    add_index :spree_import_rows, [:import_id, :row_number], unique: true
+
+    create_table :spree_import_mappings do |t|
+      t.belongs_to :import, null: false
+
+      t.string :schema_field, null: false
+      t.string :file_column, index: true
+
+      t.timestamps
+    end
+
+    add_index :spree_import_mappings, [:import_id, :schema_field], unique: true
+  end
+end

data/lib/generators/spree/authentication/devise/devise_generator.rb

@@ -48,6 +48,30 @@ module Spree
           say "Please replace < ApplicationRecord with < Spree.base_class in #{user_class_file}"
         end
 
+        if Spree.admin_user_class != Spree.user_class
+          admin_user_class_file = Rails.root.join('app', 'models', "#{Spree.admin_user_class.name.underscore}.rb")
+
+          if File.exist?(admin_user_class_file)
+            inject_into_file admin_user_class_file, after: "class #{Spree.admin_user_class.name} < ApplicationRecord\n" do
+              <<-RUBY
+    # Spree modules
+    include Spree::UserMethods
+              RUBY
+            end
+            gsub_file admin_user_class_file, "< ApplicationRecord", "< Spree.base_class"
+
+            say "Successfully added Spree admin user modules into #{admin_user_class_file}"
+          else
+            say "Could not locate admin user model file at #{admin_user_class_file}. Please add these lines manually:", :red
+            say <<~RUBY
+              # Spree modules
+              include Spree::UserMethods
+            RUBY
+
+            say "Please replace < ApplicationRecord with < Spree.base_class in #{admin_user_class_file}"
+          end
+        end
+
         append_file 'config/initializers/spree.rb' do
           %Q{
             if defined?(Devise) && Devise.respond_to?(:parent_controller)

data/lib/generators/spree/cursor_rules/cursor_rules_generator.rb

@@ -0,0 +1,19 @@
+module Spree
+  class CursorRulesGenerator < Rails::Generators::Base
+    desc 'Set up Cursor Rules - copies all Spree cursor rules to .cursor/rules directory'
+
+    def self.source_paths
+      paths = superclass.source_paths
+      paths << File.expand_path('templates', __dir__)
+      paths.flatten
+    end
+
+    def create_cursor_rules_directory
+      empty_directory '.cursor/rules'
+    end
+
+    def copy_cursor_rules
+      copy_file 'spree_rules.mdc', '.cursor/rules/spree_rules.mdc'
+    end
+  end
+end