Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Use postgres by default for development
Damian Legawieccb54afc198f3
diff --git a/bin/build.sh b/bin/build.shindex 75c624c135..6f0d5c7be2 100755--- a/bin/build.sh+++ b/bin/build.sh@@ -14,7 +14,7 @@ prepare_app(){echo "Preparing test app..."bundle exec rake test_app}-# Target postgres. Override with: `DB=sqlite bash bin/build.sh`+# Target postgres. Override with: `DB=mysql bash bin/build.sh`export DB=${DB:-postgres}# Spree defaultsdiff --git a/bin/sandbox.sh b/bin/sandbox.shindex 7812acf27f..ef91e4b52b 100755--- a/bin/sandbox.sh+++ b/bin/sandbox.sh@@ -4,14 +4,11 @@set -ecase "$DB" in-postgres)- RAILSDB="postgresql"- ;;mysql)RAILSDB="mysql";;-sqlite|'')- RAILSDB="sqlite3"+postgres|'')+ RAILSDB="postgresql";;*)echo "Invalid DB specified: $DB"diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rbindex db1942e57a..023c0fb443 100644--- a/common_spree_dependencies.rb+++ b/common_spree_dependencies.rb@@ -3,7 +3,6 @@# the one component of Spree.source 'https://rubygems.org'-gem 'sqlite3', '~> 1.4.0', platforms: [:ruby, :mingw, :mswin, :x64_mingw]gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]%w[@@ -15,7 +14,6 @@ endplatforms :jruby dogem 'jruby-openssl'- gem 'activerecord-jdbcsqlite3-adapter'endplatforms :ruby dodiff --git a/core/lib/generators/spree/dummy/dummy_generator.rb b/core/lib/generators/spree/dummy/dummy_generator.rbindex 5532529e1c..1ce3d1ec24 100644--- a/core/lib/generators/spree/dummy/dummy_generator.rb+++ b/core/lib/generators/spree/dummy/dummy_generator.rb@@ -29,7 +29,7 @@ module Spree# calling slice on a Thor::CoreExtensions::HashWithIndifferentAccess# object has been known to return nilopts = {}.merge(options).slice(*PASSTHROUGH_OPTIONS)- opts[:database] = 'sqlite3' if opts[:database].blank?+ opts[:database] = 'postgresql' if opts[:database].blank?opts[:force] = trueopts[:skip_bundle] = trueopts[:skip_gemfile] = truediff --git a/core/lib/generators/spree/dummy/templates/rails/database.yml b/core/lib/generators/spree/dummy/templates/rails/database.ymlindex beea57f74e..75bf347fd7 100644--- a/core/lib/generators/spree/dummy/templates/rails/database.yml+++ b/core/lib/generators/spree/dummy/templates/rails/database.yml@@ -8,18 +8,7 @@ end %><% db_username = ENV['DB_USERNAME'] %><% db_host = ENV['DB_HOST'] %><% case ENV['DB']- when 'sqlite' %>-development:- adapter: sqlite3- database: db/spree_development.sqlite3-test:- adapter: sqlite3- database: db/spree_test.sqlite3- timeout: 10000-production:- adapter: sqlite3- database: db/spree_production.sqlite3-<% when 'mysql' %>+ when 'mysql' %>mysql: &mysqladapter: mysql2encoding: utf8@@ -68,13 +57,26 @@ production:<<: *postgresdatabase: <%= database_prefix %><%= lib_name %>_spree_production<% else %>+postgres: &postgres+ adapter: postgresql+ <% unless db_username.blank? %>+ username: <%= db_username || 'postgres' %>+ <% end %>+ <% unless db_password.blank? %>+ password: <%= db_password %>+ <% end %>+ <% unless db_host.blank? %>+ host: <%= db_host %>+ <% end %>+ min_messages: warning+development:- adapter: sqlite3- database: db/spree_development.sqlite3+ <<: *postgres+ database: <%= database_prefix %><%= lib_name %>_spree_developmenttest:- adapter: sqlite3- database: db/spree_test.sqlite3+ <<: *postgres+ database: <%= database_prefix %><%= lib_name %>_spree_testproduction:- adapter: sqlite3- database: db/spree_production.sqlite3+ <<: *postgres+ database: <%= database_prefix %><%= lib_name %>_spree_production<% end %>