solidus_core 4.1.6 → 4.5.1

data/db/migrate/20160101010000_solidus_one_four.rb

@@ -85,19 +85,15 @@ class SolidusOneFour < ActiveRecord::Migration[5.0]
       t.integer "adjustable_id", null: false
       t.decimal "amount", precision: 10, scale: 2
       t.string "label"
-      t.boolean "eligible", default: true
       t.datetime "created_at", precision: 6
       t.datetime "updated_at", precision: 6
       t.integer "order_id", null: false
       t.boolean "included", default: false
-      t.integer "promotion_code_id"
       t.integer "adjustment_reason_id"
       t.boolean "finalized", default: false, null: false
       t.index ["adjustable_id", "adjustable_type"], name: "index_spree_adjustments_on_adjustable_id_and_adjustable_type"
       t.index ["adjustable_id"], name: "index_adjustments_on_order_id"
-      t.index ["eligible"], name: "index_spree_adjustments_on_eligible"
       t.index ["order_id"], name: "index_spree_adjustments_on_order_id"
-      t.index ["promotion_code_id"], name: "index_spree_adjustments_on_promotion_code_id"
       t.index ["source_id", "source_type"], name: "index_spree_adjustments_on_source_id_and_source_type"
     end
 
@@ -201,16 +197,6 @@ class SolidusOneFour < ActiveRecord::Migration[5.0]
       t.index ["variant_id"], name: "index_inventory_units_on_variant_id"
     end
 
-    create_table "spree_line_item_actions", force: :cascade do |t|
-      t.integer "line_item_id", null: false
-      t.integer "action_id", null: false
-      t.integer "quantity", default: 0
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["action_id"], name: "index_spree_line_item_actions_on_action_id"
-      t.index ["line_item_id"], name: "index_spree_line_item_actions_on_line_item_id"
-    end
-
     create_table "spree_line_items", force: :cascade do |t|
       t.integer "variant_id"
       t.integer "order_id"
@@ -326,16 +312,6 @@ class SolidusOneFour < ActiveRecord::Migration[5.0]
       t.index ["user_id"], name: "index_spree_orders_on_user_id"
     end
 
-    create_table "spree_orders_promotions", force: :cascade do |t|
-      t.integer "order_id"
-      t.integer "promotion_id"
-      t.integer "promotion_code_id"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["order_id", "promotion_id"], name: "index_spree_orders_promotions_on_order_id_and_promotion_id"
-      t.index ["promotion_code_id"], name: "index_spree_orders_promotions_on_promotion_code_id"
-    end
-
     create_table "spree_payment_capture_events", force: :cascade do |t|
       t.decimal "amount", precision: 10, scale: 2, default: "0.0"
       t.integer "payment_id"
@@ -411,15 +387,6 @@ class SolidusOneFour < ActiveRecord::Migration[5.0]
       t.index ["product_id"], name: "index_spree_product_option_types_on_product_id"
     end
 
-    create_table "spree_product_promotion_rules", force: :cascade do |t|
-      t.integer "product_id"
-      t.integer "promotion_rule_id"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["product_id"], name: "index_products_promotion_rules_on_product_id"
-      t.index ["promotion_rule_id"], name: "index_products_promotion_rules_on_promotion_rule_id"
-    end
-
     create_table "spree_product_properties", force: :cascade do |t|
       t.string "value"
       t.integer "product_id"
@@ -463,100 +430,6 @@ class SolidusOneFour < ActiveRecord::Migration[5.0]
       t.index ["taxon_id"], name: "index_spree_products_taxons_on_taxon_id"
     end
 
-    create_table "spree_promotion_action_line_items", force: :cascade do |t|
-      t.integer "promotion_action_id"
-      t.integer "variant_id"
-      t.integer "quantity", default: 1
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["promotion_action_id"], name: "index_spree_promotion_action_line_items_on_promotion_action_id"
-      t.index ["variant_id"], name: "index_spree_promotion_action_line_items_on_variant_id"
-    end
-
-    create_table "spree_promotion_actions", force: :cascade do |t|
-      t.integer "promotion_id"
-      t.integer "position"
-      t.string "type"
-      t.datetime "deleted_at"
-      t.text "preferences"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["deleted_at"], name: "index_spree_promotion_actions_on_deleted_at"
-      t.index ["id", "type"], name: "index_spree_promotion_actions_on_id_and_type"
-      t.index ["promotion_id"], name: "index_spree_promotion_actions_on_promotion_id"
-    end
-
-    create_table "spree_promotion_categories", force: :cascade do |t|
-      t.string "name"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.string "code"
-    end
-
-    create_table "spree_promotion_codes", force: :cascade do |t|
-      t.integer "promotion_id", null: false
-      t.string "value", null: false
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["promotion_id"], name: "index_spree_promotion_codes_on_promotion_id"
-      t.index ["value"], name: "index_spree_promotion_codes_on_value", unique: true
-    end
-
-    create_table "spree_promotion_rule_taxons", force: :cascade do |t|
-      t.integer "taxon_id"
-      t.integer "promotion_rule_id"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["promotion_rule_id"], name: "index_spree_promotion_rule_taxons_on_promotion_rule_id"
-      t.index ["taxon_id"], name: "index_spree_promotion_rule_taxons_on_taxon_id"
-    end
-
-    create_table "spree_promotion_rules", force: :cascade do |t|
-      t.integer "promotion_id"
-      t.integer "product_group_id"
-      t.string "type"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.string "code"
-      t.text "preferences"
-      t.index ["product_group_id"], name: "index_promotion_rules_on_product_group_id"
-      t.index ["promotion_id"], name: "index_spree_promotion_rules_on_promotion_id"
-    end
-
-    create_table "spree_promotion_rules_users", force: :cascade do |t|
-      t.integer "user_id"
-      t.integer "promotion_rule_id"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["promotion_rule_id"], name: "index_promotion_rules_users_on_promotion_rule_id"
-      t.index ["user_id"], name: "index_promotion_rules_users_on_user_id"
-    end
-
-    create_table "spree_promotions", force: :cascade do |t|
-      t.string "description"
-      t.datetime "expires_at"
-      t.datetime "starts_at"
-      t.string "name"
-      t.string "type"
-      t.integer "usage_limit"
-      t.string "match_policy", default: "all"
-      t.string "code"
-      t.boolean "advertise", default: false
-      t.string "path"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.integer "promotion_category_id"
-      t.integer "per_code_usage_limit"
-      t.boolean "apply_automatically", default: false
-      t.index ["advertise"], name: "index_spree_promotions_on_advertise"
-      t.index ["apply_automatically"], name: "index_spree_promotions_on_apply_automatically"
-      t.index ["code"], name: "index_spree_promotions_on_code"
-      t.index ["expires_at"], name: "index_spree_promotions_on_expires_at"
-      t.index ["id", "type"], name: "index_spree_promotions_on_id_and_type"
-      t.index ["promotion_category_id"], name: "index_spree_promotions_on_promotion_category_id"
-      t.index ["starts_at"], name: "index_spree_promotions_on_starts_at"
-    end
-
     create_table "spree_properties", force: :cascade do |t|
       t.string "name"
       t.string "presentation", null: false

data/db/migrate/20220419170826_remove_archived_user_addresses.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class RemoveArchivedUserAddresses < ActiveRecord::Migration[5.2]
+  def up
+    Spree::UserAddress.where(archived: true).delete_all
+    remove_column :spree_user_addresses, :archived, :boolean, default: false
+  end
+
+  def down
+    add_column :spree_user_addresses, :archived, :boolean, default: false
+  end
+end

data/db/migrate/20230427095534_drop_deprecated_address_id_from_shipments.rb

@@ -5,7 +5,7 @@ class DropDeprecatedAddressIdFromShipments < ActiveRecord::Migration[5.2]
   end
 
   def down
-    add_column :spree_shipments, :deprecated_address_id
+    add_column :spree_shipments, :deprecated_address_id, :integer
     add_index :spree_shipments, :deprecated_address_id, name: :index_spree_shipments_on_deprecated_address_id
   end
 end

data/db/migrate/20240821173254_create_spree_permission_sets_in_core.rb

@@ -0,0 +1,9 @@
+class CreateSpreePermissionSetsInCore < ActiveRecord::Migration[7.0]
+  def change
+    create_table :spree_permission_sets, if_not_exists: true do |t|
+      t.string :name
+      t.string :set
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20240821173341_create_spree_roles_permissions_in_core.rb

@@ -0,0 +1,9 @@
+class CreateSpreeRolesPermissionsInCore < ActiveRecord::Migration[7.0]
+  def change
+    create_table :spree_role_permissions, if_not_exists: true do |t|
+      t.references :role
+      t.references :permission_set
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20240821173641_add_description_to_spree_roles.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToSpreeRoles < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_roles, :description, :text
+  end
+end

data/db/migrate/20240904152041_add_privilege_and_category_to_spree_permission_sets.rb

@@ -0,0 +1,6 @@
+class AddPrivilegeAndCategoryToSpreePermissionSets < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_permission_sets, :privilege, :string
+    add_column :spree_permission_sets, :category, :string
+  end
+end

data/db/migrate/20250129061658_add_metadata_to_spree_resources.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class AddMetadataToSpreeResources < ActiveRecord::Migration[7.2]
+  def change
+    # List of Resources to add metadata columns to
+    %i[
+      spree_orders
+      spree_line_items
+      spree_shipments
+      spree_payments
+      spree_refunds
+      spree_customer_returns
+      spree_store_credit_events
+      spree_return_authorizations
+    ].each do |table_name|
+      change_table table_name do |t|
+        # Check if the database supports jsonb for efficient querying
+        if t.respond_to?(:jsonb)
+          t.jsonb(:customer_metadata, default: {}) unless t.column_exists?(:customer_metadata)
+          t.jsonb(:admin_metadata, default: {}) unless t.column_exists?(:admin_metadata)
+        else
+          t.json(:customer_metadata) unless t.column_exists?(:customer_metadata)
+          t.json(:admin_metadata) unless t.column_exists?(:admin_metadata)
+        end
+      end
+    end
+  end
+end

data/db/migrate/20250201172950_add_gtin_and_condition_to_spree_variant.rb

@@ -0,0 +1,6 @@
+class AddGtinAndConditionToSpreeVariant < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_variants, :gtin, :string
+    add_column :spree_variants, :condition, :string
+  end
+end

data/db/migrate/20250207104016_add_primary_taxon_to_products.rb

@@ -0,0 +1,7 @@
+class AddPrimaryTaxonToProducts < ActiveRecord::Migration[7.0]
+  def change
+    change_table :spree_products do |t|
+      t.references :primary_taxon, type: :integer, foreign_key: { to_table: :spree_taxons }
+    end
+  end
+end

data/db/migrate/20250221152004_add_metadata_to_users.rb

@@ -0,0 +1,13 @@
+class AddMetadataToUsers < ActiveRecord::Migration[7.0]
+  def change
+    change_table Spree.user_class.table_name do |t|
+      if t.respond_to?(:jsonb)
+        t.jsonb(:customer_metadata, default: {}) unless t.column_exists?(:customer_metadata)
+        t.jsonb(:admin_metadata, default: {}) unless t.column_exists?(:admin_metadata)
+      else
+        t.json(:customer_metadata) unless t.column_exists?(:customer_metadata)
+        t.json(:admin_metadata) unless t.column_exists?(:admin_metadata)
+      end
+    end
+  end
+end

data/db/seeds.rb

@@ -13,6 +13,7 @@ shell = Thor::Base.shell.new
   zones
   refund_reasons
   roles
+  permission_sets
   shipping_categories
 ).each do |seed|
   shell.say_status :seed, seed

data/lib/generators/solidus/install/app_templates/authentication/custom.rb

@@ -9,11 +9,6 @@ initializer 'spree_authentication.rb', <<~RUBY
       nil
     end
   end
-
-  # Re-raise the original authorization error on anauthorized access
-  Rails.application.config.to_prepare do
-    Spree::BaseController.unauthorized_redirect = -> { raise "Define the behavior for unauthorized access in \#{__FILE__}." }
-  end
 RUBY
 
 create_file 'app/views/spree/admin/shared/_navigation_footer.html.erb', <<~ERB

data/lib/generators/solidus/install/app_templates/frontend/starter.rb

@@ -1 +1 @@
-apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v4.1/template.rb'
+apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v4.5/template.rb'

data/lib/generators/solidus/install/install_generator.rb

@@ -34,10 +34,13 @@ module Solidus
     class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations and seeds must be run)'
     class_option :active_storage, type: :boolean, default: true, banner: 'Install ActiveStorage as image attachments handler for products and taxons'
+    class_option :admin_preview, type: :boolean, default: true, desc: 'Install the admin preview'
+    class_option :build_admin_tailwind, type: :boolean, default: true, desc: 'Build and install Solidus Admin Tailwind CSS file and rake tasks'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
     class_option :admin_password, type: :string
+    class_option :mount_point, type: :string, desc: "Indicates where Solidus should be mounted. Defaults to '/'"
 
     class_option :frontend, type: :string, enum: FRONTENDS.map { _1[:name] }, default: nil, desc: "Indicates which frontend to install."
     class_option :authentication, type: :string, enum: AUTHENTICATIONS.map { _1[:name] }, default: nil, desc: "Indicates which authentication system to install."
@@ -86,6 +89,36 @@ module Solidus
       ENV['SOLIDUS_SKIP_MIGRATIONS_CHECK'] = 'true'
     end
 
+    def install_routes
+      if Pathname(app_path).join('config', 'routes.rb').read.include? CORE_MOUNT_ROUTE
+        say_status :route_exist, CORE_MOUNT_ROUTE, :blue
+      else
+        say_status :installing, "solidus routes"
+        mount_point = options[:mount_point] || ask_with_default(
+          desc: 'Where would you like to mount Solidus? (E.g. "/store" or "/shop")',
+          default: '/',
+        )
+
+        shell.mute do
+          route <<~RUBY
+            # This line mounts Solidus's routes at the root of your application.
+            #
+            # Unless you manually picked only a subset of Solidus components, this will mount routes for:
+            #   - solidus_backend
+            #   - solidus_api
+            # This means, any requests to URLs such as /admin/products, will go to Spree::Admin::ProductsController.
+            #
+            # If you are using the Starter Frontend as your frontend, be aware that all the storefront routes are defined
+            # separately in this file and are not part of the Solidus::Core::Engine engine.
+            #
+            # If you would like to change where this engine is mounted, simply change the :at option to something different.
+            # We ask that you don't use the :as option here, as Solidus relies on it being the default of "spree"
+            #{CORE_MOUNT_ROUTE}, at: '#{mount_point}'
+          RUBY
+        end
+      end
+    end
+
     def add_files
       template 'config/initializers/spree.rb.tt', 'config/initializers/spree.rb'
     end
@@ -133,21 +166,6 @@ module Solidus
       rake 'db:create'
     end
 
-    def install_routes
-      if Pathname(app_path).join('config', 'routes.rb').read.include? CORE_MOUNT_ROUTE
-        say_status :route_exist, CORE_MOUNT_ROUTE, :blue
-      else
-        route <<~RUBY
-          # This line mounts Solidus's routes at the root of your application.
-          # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
-          # If you would like to change where this engine is mounted, simply change the :at option to something different.
-          #
-          # We ask that you don't use the :as option here, as Solidus relies on it being the default of "spree"
-          #{CORE_MOUNT_ROUTE}, at: '/'
-        RUBY
-      end
-    end
-
     def run_migrations
       if @run_migrations
         say_status :running, "migrations"
@@ -164,6 +182,16 @@ module Solidus
       apply_template_for :payment_method, @selected_payment_method
     end
 
+    def install_solidus_admin
+      return unless options[:admin_preview]
+
+      say_status :installing, "SolidusAdmin", :blue
+      unless File.read(app_path.join('Gemfile')).include?('solidus_admin')
+        bundle_command 'add solidus_admin -v ">= 0.2"'
+      end
+      generate "solidus_admin:install #{'--tailwind' if options[:build_admin_tailwind]}"
+    end
+
     def populate_seed_data
       if @load_seed_data
         say_status :loading, "seed data"
@@ -200,6 +228,27 @@ module Solidus
       Bundler.reset_paths!
     end
 
+    def ask_with_default(desc:, default:)
+      if options[:auto_accept]
+        say_status :using, "#{default} (default)"
+        return default
+      end
+
+      default_label = " (#{set_color :default, :bold}: \"#{default}\")" if default
+
+      say_status :question, "#{desc}#{default_label}.", :yellow
+      answer = ask(set_color("answer:".rjust(13), :blue, :bold)).to_s.downcase.presence
+
+      case answer
+      when nil
+        say_status :using, "#{default} (default)"
+        default
+      else
+        say_status :using, answer
+        answer
+      end
+    end
+
     def ask_with_description(desc:, limited_to:, default:)
       loop do
         say_status :question, desc, :yellow

data/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt

@@ -33,19 +33,19 @@ Spree.config do |config|
   # Custom logo for the admin
   # config.admin_interface_logo = "logo/solidus.svg"
 
-  # Gateway credentials can be configured statically here and referenced from
+  # Payment gateway credentials can be configured statically here and referenced from
   # the admin. They can also be fully configured from the admin.
   #
-  # Please note that you need to use the solidus_stripe gem to have
-  # Stripe working: https://github.com/solidusio-contrib/solidus_stripe
+  # Please note that the example below requires the `solidus_stripe` ~> 5.0 gem
+  # in order to work properly (see https://github.com/solidusio-contrib/solidus_stripe).
   #
   # config.static_model_preferences.add(
-  #   Spree::PaymentMethod::StripeCreditCard,
-  #   'stripe_env_credentials',
-  #   secret_key: ENV['STRIPE_SECRET_KEY'],
-  #   publishable_key: ENV['STRIPE_PUBLISHABLE_KEY'],
-  #   server: Rails.env.production? ? 'production' : 'test',
-  #   test_mode: !Rails.env.production?
+  #   'SolidusStripe::PaymentMethod',
+  #   'solidus_stripe_env_credentials',
+  #   api_key: ENV.fetch('SOLIDUS_STRIPE_API_KEY'),
+  #   publishable_key: ENV.fetch('SOLIDUS_STRIPE_PUBLISHABLE_KEY'),
+  #   test_mode: ENV.fetch('SOLIDUS_STRIPE_API_KEY').start_with?('sk_test_'),
+  #   webhook_endpoint_signing_secret: ENV.fetch('SOLIDUS_STRIPE_WEBHOOK_SIGNING_SECRET')
   # )
 end
 
@@ -57,9 +57,12 @@ Spree::Backend::Config.configure do |config|
   # a new menu item:
   #
   # config.menu_items << config.class::MenuItem.new(
-  #   [:section],
-  #   'icon-name',
-  #   url: 'https://solidus.io/'
+  #   label: :my_reports,
+  #   icon: 'file-text-o', # see https://fontawesome.com/v4/icons/
+  #   url: :my_admin_reports_path,
+  #   condition: -> { can?(:admin, MyReports) },
+  #   partial: 'spree/admin/shared/my_reports_sub_menu',
+  #   match_path: '/reports',
   # )
 
   # Custom frontend product path

data/lib/generators/solidus/update/update_generator.rb

@@ -110,7 +110,7 @@ module Solidus
     end
 
     def changes_template_for(klass, from, to)
-      changes = Spree::Preferences::PreferenceDifferentiator.new(klass).call(from: from, to: to)
+      changes = Spree::Preferences::PreferenceDifferentiator.new(klass).call(from:, to:)
       return '# No changes' if changes.empty?
 
       [

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -61,7 +61,7 @@ module Spree
       template "rails/application.rb.tt", "#{dummy_path}/config/application.rb", force: true
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
       template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", force: true
-      template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", force: true
+      template "rails/manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true
     end
 
     def test_dummy_inject_extension_requirements

data/lib/generators/spree/dummy/templates/rails/application.rb.tt

@@ -2,7 +2,7 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require(*Rails.groups(assets: %w(development test)))
+Bundler.require(*Rails.groups)
 
 require '<%= lib_name %>'
 

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -1,113 +1,61 @@
-<% db = case ENV['DB']
-        when 'mysql'
-          'mysql'
-        when 'postgres', 'postgresql'
-          'postgres'
-        when /sqlite3?/, '', nil
-          'sqlite'
-        else
-          raise "Invalid DB specified: #{ENV['DB']}"
-        end %>
-<% db_host = case db
-             when 'mysql'
-               ENV['DB_MYSQL_HOST'] || ENV['DB_HOST']
-             when 'postgres'
-               ENV['DB_POSTGRES_HOST'] || ENV['DB_HOST']
-             else
-               ENV['DB_HOST']
-             end %>
-<% db_username = ENV['DB_USERNAME'] %>
-<% db_password = ENV['DB_PASSWORD'] %>
+<%
+  adapter =
+    case ENV['DB']
+    when 'mysql2', 'mysql' then 'mysql2'
+    when 'postgresql', 'postgres' then 'postgresql'
+    when 'sqlite3', 'sqlite', '', nil then 'sqlite3'
+    else raise "Invalid DB specified " + ENV['DB'].inspect
+    end
 
-<% case db
-  when 'mysql' %>
+  db_host =
+    case adapter
+    when 'mysql2' then ENV['DB_MYSQL_HOST'] || ENV['DB_HOST']
+    when 'postgres' then ENV['DB_POSTGRES_HOST'] || ENV['DB_HOST']
+    else ENV['DB_HOST']
+    end
+
+  db_username = ENV['DB_USERNAME']
+  db_password = ENV['DB_PASSWORD'] %>
+
+default: &default
+  adapter: <%= adapter %>
+  <% unless db_username.blank? %>username: <%= db_username %><% end %>
+  <% unless db_password.blank? %>password: <%= db_password %><% end %>
+  <% unless db_host.blank? %>host: <%= db_host %><% end %>
+  <% if adapter == 'mysql2' %>encoding: utf8<% end %>
+  <% if adapter == 'postgresql' %>min_messages: warning<% end %>
+
+<% if adapter == 'mysql2' %>
 development:
-  adapter: mysql2
+  <<: *default
   database: <%= options[:lib_name] %>_solidus_development
-  <% unless db_username.blank? %>
-  username: <%= db_username %>
-  <% end %>
-  <% unless db_password.blank? %>
-  password: <%= db_password %>
-  <% end %>
-  <% unless db_host.blank? %>
-  host: <%= db_host %>
-  <% end %>
-  encoding: utf8
 test:
-  adapter: mysql2
+  <<: *default
   database: <%= options[:lib_name] %>_solidus_test
-  <% unless db_username.blank? %>
-  username: <%= db_username %>
-  <% end %>
-  <% unless db_password.blank? %>
-  password: <%= db_password %>
-  <% end %>
-  <% unless db_host.blank? %>
-  host: <%= db_host %>
-  <% end %>
-  encoding: utf8
 production:
-  adapter: mysql2
+  <<: *default
   database: <%= options[:lib_name] %>_solidus_production
-  <% unless db_username.blank? %>
-  username: <%= db_username %>
-  <% end %>
-  <% unless db_password.blank? %>
-  password: <%= db_password %>
-  <% end %>
-  <% unless db_host.blank? %>
-  host: <%= db_host %>
-  <% end %>
-  encoding: utf8
-<% when 'postgres', 'postgresql' %>
+
+<% elsif adapter == 'postgresql' %>
 development:
-  adapter: postgresql
+  <<: *default
   database: <%= options[:lib_name] %>_solidus_development
-  <% unless db_username.blank? %>
-  username: <%= db_username %>
-  <% end %>
-  <% unless db_password.blank? %>
-  password: <%= db_password %>
-  <% end %>
-  <% unless db_host.blank? %>
-  host: <%= db_host %>
-  <% end %>
-  min_messages: warning
 test:
-  adapter: postgresql
+  <<: *default
   database: <%= options[:lib_name] %>_solidus_test
-  <% unless db_username.blank? %>
-  username: <%= db_username %>
-  <% end %>
-  <% unless db_password.blank? %>
-  password: <%= db_password %>
-  <% end %>
-  <% unless db_host.blank? %>
-  host: <%= db_host %>
-  <% end %>
-  min_messages: warning
 production:
-  adapter: postgresql
+  <<: *default
   database: <%= options[:lib_name] %>_solidus_production
-  <% unless db_username.blank? %>
-  username: <%= db_username %>
-  <% end %>
-  <% unless db_password.blank? %>
-  password: <%= db_password %>
-  <% end %>
-  <% unless db_host.blank? %>
-  host: <%= db_host %>
-  <% end %>
-  min_messages: warning
-<% when 'sqlite', '', nil %>
+
+<% elsif adapter == 'sqlite3' %>
 development:
-  adapter: sqlite3
+  <<: *default
   database: db/solidus_development.sqlite3
 test:
-  adapter: sqlite3
+  <<: *default
   database: db/solidus_test.sqlite3
 production:
-  adapter: sqlite3
+  <<: *default
   database: db/solidus_production.sqlite3
+
 <% end %>