dev: use sqlite by default for development

evilmartians · Oct 27, 2023 · d12c95e · d12c95e
1 parent 500a35e
commit d12c95e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,4 +14,5 @@ if File.exist?(local_gemfile)
   eval(File.read(local_gemfile)) # rubocop:disable Security/Eval
 else
   gem "rails", "~> 7.0"
+  gem "sqlite3", "~> 1.4.2"
 end
diff --git a/activerecord-slotted_counters.gemspec b/activerecord-slotted_counters.gemspec
@@ -30,7 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.15"
   s.add_development_dependency "rake", ">= 13.0"
   s.add_development_dependency "rspec", ">= 3.9"
-  s.add_development_dependency "pg", ">= 1.4"
-  s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec-sqlimit"
 end
diff --git a/gemfiles/rails6.gemfile b/gemfiles/rails6.gemfile
@@ -2,5 +2,7 @@ source "https://rubygems.org"
 
 gem "rails", "~> 6.0"
 gem "mysql2"
+gem "pg"
+gem "sqlite3"
 
 gemspec path: ".."
diff --git a/gemfiles/rails7.gemfile b/gemfiles/rails7.gemfile
@@ -2,5 +2,7 @@ source "https://rubygems.org"
 
 gem "rails", "~> 7.0"
 gem "mysql2"
+gem "pg"
+gem "sqlite3"
 
 gemspec path: ".."
diff --git a/gemfiles/railsmaster.gemfile b/gemfiles/railsmaster.gemfile
@@ -2,5 +2,7 @@ source "https://rubygems.org"
 
 gem "rails", github: "rails/rails"
 gem "mysql2"
+gem "pg"
+gem "sqlite3"
 
 gemspec path: ".."
diff --git a/spec/support/active_record_init.rb b/spec/support/active_record_init.rb
@@ -19,7 +19,7 @@
       {"database" => ENV.fetch("DB_NAME", "slotted_counters_test")}
     )
     config.respond_to?(:configuration_hash) ? config.configuration_hash : config.config
-  elsif ENV["DB"] == "sqlite"
+  else
     # Make sure we don't have a DATABASE_URL set (it can be used by libs, e.g., database_cleaner)
     ENV.delete("DATABASE_URL") if ENV["DATABASE_URL"]