spree_core 5.4.3 → 5.5.0.rc1

data/db/migrate/20260429000003_add_status_to_spree_orders.rb

@@ -0,0 +1,6 @@
+class AddStatusToSpreeOrders < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_orders, :status, :string
+    add_index :spree_orders, :status
+  end
+end

data/db/migrate/20260429000004_add_scopes_to_spree_api_keys.rb

@@ -0,0 +1,11 @@
+class AddScopesToSpreeApiKeys < ActiveRecord::Migration[7.2]
+  def change
+    change_table :spree_api_keys do |t|
+      if t.respond_to?(:jsonb)
+        t.jsonb :scopes
+      else
+        t.json :scopes
+      end
+    end
+  end
+end

data/db/migrate/20260501000001_create_spree_stock_reservations.rb

@@ -0,0 +1,19 @@
+class CreateSpreeStockReservations < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_stock_reservations do |t|
+      t.references :stock_item, null: false, index: false
+      t.references :line_item, null: false
+      t.references :order, null: false
+      t.integer :quantity, null: false
+      t.datetime :expires_at, null: false
+      t.timestamps
+    end
+
+    # Composite (stock_item_id, expires_at) is the hot-path Quantifier query;
+    # leading on stock_item_id makes it cover the standalone-by-stock-item lookup too.
+    add_index :spree_stock_reservations, [:stock_item_id, :expires_at]
+    add_index :spree_stock_reservations, [:stock_item_id, :line_item_id], unique: true,
+              name: 'idx_stock_reservations_item_line_item'
+    add_index :spree_stock_reservations, :expires_at
+  end
+end

data/db/migrate/20260507162651_create_spree_variant_media.rb

@@ -0,0 +1,23 @@
+class CreateSpreeVariantMedia < ActiveRecord::Migration[7.2]
+  # `media_id` references spree_assets.id in 5.5 — the parent table renames to
+  # spree_media in 6.0 (see 5.4-6.0-product-media-system.md Phase 3 of the 6.0
+  # cleanup). Using `media_id` from the start saves a column rename in 6.0.
+  #
+  # Table name is `spree_variant_media` (not the Rails default `spree_variant_medias`)
+  # since "media" reads as collective; the model overrides `self.table_name`.
+  #
+  # No per-variant `position` column — gallery order comes from the asset's
+  # product-level position (Asset#position). Variant gallery resolution filters
+  # product media down to the linked subset and inherits the product's order.
+  def change
+    create_table :spree_variant_media do |t|
+      t.references :variant, null: false, index: false
+      t.bigint :media_id, null: false
+      t.timestamps
+    end
+
+    add_index :spree_variant_media, [:variant_id, :media_id], unique: true,
+              name: 'idx_variant_media_unique'
+    add_index :spree_variant_media, :media_id, name: 'idx_variant_media_media'
+  end
+end

data/db/migrate/20260508175303_add_pickup_to_spree_stock_locations.rb

@@ -0,0 +1,12 @@
+class AddPickupToSpreeStockLocations < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_stock_locations, :kind, :string, null: false, default: 'warehouse'
+    add_column :spree_stock_locations, :pickup_enabled, :boolean, null: false, default: false
+    add_column :spree_stock_locations, :pickup_stock_policy, :string, null: false, default: 'local'
+    add_column :spree_stock_locations, :pickup_ready_in_minutes, :integer
+    add_column :spree_stock_locations, :pickup_instructions, :text
+
+    add_index :spree_stock_locations, :pickup_enabled
+    add_index :spree_stock_locations, :kind
+  end
+end

data/db/migrate/20260508204040_create_spree_channels.rb

@@ -0,0 +1,18 @@
+class CreateSpreeChannels < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_channels do |t|
+      t.references :store, null: false
+      t.string :name, null: false
+      t.string :code, null: false
+      t.boolean :active, null: false
+      t.text :preferences
+      t.timestamps
+    end
+
+    add_index :spree_channels, %i[store_id code], unique: true
+
+    # Default-channel backfill for existing stores lives in
+    # +rake spree:channels:create_defaults+ (data transformations don't belong
+    # in migrations per Spree's guidelines).
+  end
+end

data/db/migrate/20260508204041_create_spree_order_routing_rules.rb

@@ -0,0 +1,18 @@
+class CreateSpreeOrderRoutingRules < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_order_routing_rules do |t|
+      t.references :store, null: false
+      t.references :channel, null: false
+      t.string :type, null: false
+      t.integer :position, null: false
+      t.boolean :active, null: false
+      t.text :preferences
+      t.timestamps
+    end
+
+    add_index :spree_order_routing_rules, [:channel_id, :position]
+    add_index :spree_order_routing_rules, [:channel_id, :active, :position],
+              name: 'idx_order_routing_rules_lookup'
+    add_index :spree_order_routing_rules, :type
+  end
+end

data/db/migrate/20260508204042_add_preferred_stock_location_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddPreferredStockLocationToSpreeOrders < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :spree_orders, :preferred_stock_location
+  end
+end

data/db/migrate/20260508204043_add_channel_id_to_spree_orders.rb

@@ -0,0 +1,10 @@
+class AddChannelIdToSpreeOrders < ActiveRecord::Migration[7.2]
+  # Non-destructive: adds the FK column alongside the existing `channel`
+  # string column. Old reads keep working until the upgrade rake task
+  # `spree:order_routing:backfill_channel_ids` populates `channel_id`.
+  # The string column is dropped in a follow-up migration once the
+  # backfill has run.
+  def change
+    add_reference :spree_orders, :channel
+  end
+end

data/db/migrate/20260511000001_backfill_status_on_spree_orders.rb

@@ -0,0 +1,57 @@
+class BackfillStatusOnSpreeOrders < ActiveRecord::Migration[7.2]
+  BATCH_SIZE = 10_000
+
+  STATE_TO_STATUS = {
+    'placed'   => %w[complete resumed returned awaiting_return],
+    'canceled' => %w[canceled partially_canceled]
+  }.freeze
+
+  def up
+    STATE_TO_STATUS.each do |target_status, states|
+      backfill_in_batches(target_status, states)
+    end
+
+    # Anything still NULL (carts, in-progress checkouts) becomes draft.
+    backfill_in_batches('draft', nil)
+
+    change_column_default :spree_orders, :status, 'draft'
+    change_column_null    :spree_orders, :status, false
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration,
+          'Backfilled status values cannot be safely restored: writes made after deploy ' \
+          'are indistinguishable from the backfill. Roll back manually if needed.'
+  end
+
+  private
+
+  def backfill_in_batches(target_status, source_states)
+    quoted_status = connection.quote(target_status)
+    state_filter =
+      if source_states
+        quoted = Array(source_states).map { |s| connection.quote(s) }.join(',')
+        "AND state IN (#{quoted})"
+      else
+        ''
+      end
+
+    loop do
+      # The nested SELECT wrap (`SELECT id FROM (SELECT id ... LIMIT N) AS t`) is
+      # required for MySQL, which refuses an UPDATE that selects from the same
+      # table in the WHERE clause without an intermediate derived table.
+      affected = connection.update(<<~SQL.squish)
+        UPDATE spree_orders SET status = #{quoted_status}
+         WHERE id IN (
+           SELECT id FROM (
+             SELECT id FROM spree_orders
+              WHERE status IS NULL #{state_filter}
+              LIMIT #{BATCH_SIZE}
+           ) AS spree_orders_batch
+         )
+      SQL
+
+      break if affected < BATCH_SIZE
+    end
+  end
+end

data/db/migrate/20260515000001_add_store_id_to_spree_newsletter_subscribers.rb

@@ -0,0 +1,25 @@
+class AddStoreIdToSpreeNewsletterSubscribers < ActiveRecord::Migration[7.2]
+  def up
+    add_reference :spree_newsletter_subscribers, :store
+
+    # For spree_multi_tenant we need handle the backfill and indices there
+    return if defined?(SpreeMultiTenant)
+
+    default_store = Spree::Store.default
+    Spree::NewsletterSubscriber.update_all(store_id: default_store.id) if default_store&.persisted?
+
+    change_column_null :spree_newsletter_subscribers, :store_id, false
+
+    remove_index :spree_newsletter_subscribers, :email, unique: true, if_exists: true
+    add_index :spree_newsletter_subscribers, [:email, :store_id], unique: true, if_not_exists: true
+  end
+
+  def down
+    unless defined?(SpreeMultiTenant)
+      remove_index :spree_newsletter_subscribers, [:email, :store_id], if_exists: true
+      add_index :spree_newsletter_subscribers, :email, unique: true, if_not_exists: true
+    end
+
+    remove_reference :spree_newsletter_subscribers, :store
+  end
+end

data/db/migrate/20260529000001_add_unique_index_to_spree_price_rules.rb

@@ -0,0 +1,41 @@
+class AddUniqueIndexToSpreePriceRules < ActiveRecord::Migration[7.2]
+  def up
+    # Remove duplicate rules (same type within the same price list),
+    # keeping the oldest record. Mirrors the
+    # `validates :type, uniqueness: { scope: :price_list_id }` model
+    # constraint at the DB level so concurrent writes can't race past
+    # the validation.
+    if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      execute <<-SQL
+        DELETE FROM spree_price_rules
+        WHERE id NOT IN (
+          SELECT min_id FROM (
+            SELECT MIN(id) AS min_id
+            FROM spree_price_rules
+            GROUP BY price_list_id, type
+          ) AS keeper_ids
+        )
+      SQL
+    else
+      execute <<-SQL
+        DELETE FROM spree_price_rules
+        WHERE id NOT IN (
+          SELECT MIN(id)
+          FROM spree_price_rules
+          GROUP BY price_list_id, type
+        )
+      SQL
+    end
+
+    remove_index :spree_price_rules, [:price_list_id, :type], if_exists: true
+
+    add_index :spree_price_rules, [:price_list_id, :type], unique: true,
+              name: 'index_spree_price_rules_on_price_list_id_and_type'
+  end
+
+  def down
+    remove_index :spree_price_rules, name: 'index_spree_price_rules_on_price_list_id_and_type', if_exists: true
+
+    add_index :spree_price_rules, [:price_list_id, :type]
+  end
+end

data/db/migrate/20260529000002_add_unique_index_to_spree_promotion_rules.rb

@@ -0,0 +1,37 @@
+class AddUniqueIndexToSpreePromotionRules < ActiveRecord::Migration[7.2]
+  def up
+    # Remove duplicate rules (same type within the same promotion),
+    # keeping the oldest record. Mirrors the
+    # `validates :type, uniqueness: { scope: :promotion_id }` model
+    # constraint at the DB level so concurrent writes can't race past
+    # the validation.
+    if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      execute <<-SQL
+        DELETE FROM spree_promotion_rules
+        WHERE id NOT IN (
+          SELECT min_id FROM (
+            SELECT MIN(id) AS min_id
+            FROM spree_promotion_rules
+            GROUP BY promotion_id, type
+          ) AS keeper_ids
+        )
+      SQL
+    else
+      execute <<-SQL
+        DELETE FROM spree_promotion_rules
+        WHERE id NOT IN (
+          SELECT MIN(id)
+          FROM spree_promotion_rules
+          GROUP BY promotion_id, type
+        )
+      SQL
+    end
+
+    add_index :spree_promotion_rules, [:promotion_id, :type], unique: true,
+              name: 'index_spree_promotion_rules_on_promotion_id_and_type'
+  end
+
+  def down
+    remove_index :spree_promotion_rules, name: 'index_spree_promotion_rules_on_promotion_id_and_type', if_exists: true
+  end
+end

data/db/migrate/20260601000001_create_spree_product_publications.rb

@@ -0,0 +1,14 @@
+class CreateSpreeProductPublications < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_product_publications do |t|
+      t.references :product, null: false
+      t.references :channel, null: false
+      t.datetime :published_at
+      t.datetime :unpublished_at
+      t.timestamps
+    end
+
+    add_index :spree_product_publications, %i[product_id channel_id], unique: true,
+              name: 'index_spree_product_publications_on_product_and_channel'
+  end
+end

data/db/migrate/20260601000002_add_store_id_to_spree_products.rb

@@ -0,0 +1,16 @@
+class AddStoreIdToSpreeProducts < ActiveRecord::Migration[7.2]
+  # NOTE: After running this migration, existing products will have
+  # +store_id IS NULL+ and be invisible to +Product.for_store+. Operators
+  # upgrading from 5.4 MUST run the backfill task immediately afterwards:
+  #
+  #   bundle exec rake spree:upgrade:populate_publications
+  #
+  # The backfill is also chained from +spree:channels:upgrade+ so the full
+  # 5.4 → 5.5 channel/publication upgrade is one command.
+  def change
+    add_reference :spree_products, :store, null: true
+    add_column :spree_products, :units_sold_count, :integer, default: 0, null: false
+    add_column :spree_products, :revenue, :decimal, precision: 16, scale: 4, default: 0, null: false
+    add_index :spree_products, %i[store_id units_sold_count]
+  end
+end

data/db/migrate/20260602000001_add_default_to_spree_channels.rb

@@ -0,0 +1,14 @@
+class AddDefaultToSpreeChannels < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_channels, :default, :boolean, null: false, default: false
+
+    # Partial unique index: one default channel per store. Supported on
+    # Postgres and SQLite; MySQL ignores the +where:+ option, so we fall
+    # back to a model-level uniqueness validation there.
+    unless ActiveRecord::Base.connection.adapter_name.match?(/mysql/i)
+      add_index :spree_channels, :store_id, unique: true,
+                where: '"default" = TRUE',
+                name: 'index_spree_channels_default_per_store'
+    end
+  end
+end

data/db/sample_data/channels.rb

@@ -0,0 +1,12 @@
+# Adds two extra channels alongside the seeded 'Online Store' so sample data
+# exercises the channel-aware code paths (publishing, channel filters,
+# channel-scoped order attribution).
+store = Spree::Store.default
+
+store.channels.find_or_create_by!(code: 'pos') do |channel|
+  channel.name = 'Point of Sale'
+end
+
+store.channels.find_or_create_by!(code: 'wholesale') do |channel|
+  channel.name = 'Wholesale'
+end

data/db/sample_data/orders.rb

@@ -78,7 +78,7 @@ end
 
 orders.each(&:create_proposed_shipments)
 
-Spree::Order.where(id: orders.map(&:id)).update_all(state: :complete, completed_at: Time.current - 1.day)
+Spree::Order.where(id: orders.map(&:id)).update_all(state: :complete, status: 'placed', completed_at: Time.current - 1.day)
 
 # Adjustments (tax)
 tax_rate = Spree::TaxRate.find_by(name: 'California')