Use a database that supports concurrent connections

salsify · Oct 14, 2020 · ad1f6a6 · ad1f6a6
1 parent 1b199db
commit ad1f6a6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/delayed_job_heartbeat_plugin.gemspec b/delayed_job_heartbeat_plugin.gemspec
@@ -26,15 +26,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'activerecord', ['>= 5.2', '< 6.1']
   spec.add_development_dependency 'coveralls_reborn', '>= 0.18.0'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'
+  spec.add_development_dependency 'pg'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'timecop'
-
-  if RUBY_PLATFORM == 'java'
-    spec.add_development_dependency 'jdbc-sqlite3'
-    spec.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-  else
-    spec.add_development_dependency 'sqlite3', '~> 1.4'
-  end
 end
diff --git a/spec/db/database.yml b/spec/db/database.yml
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -30,15 +30,26 @@
 ActiveRecord::Base.logger = Delayed::Worker.logger
 ActiveRecord::Migration.verbose = false
 
-db_adapter = ENV.fetch('ADAPTER', 'sqlite3')
-config = YAML.load(File.read('spec/db/database.yml'))
-ActiveRecord::Base.establish_connection(config[db_adapter])
-require 'db/schema'
+database_name = 'delayed_job_heartbeat_plugin_test'
+database_host = ENV.fetch('PGHOST', 'localhost')
+database_port = ENV.fetch('PGPORT', 5432)
 
 RSpec.configure do |config|
   config.order = 'random'
 
   config.before(:suite) do
+    `dropdb --host #{database_host} --port #{database_port} --if-exists #{database_name} 2> /dev/null`
+    `createdb --host #{database_host} --port #{database_port} #{database_name}`
+    `psql --host #{database_host} --port #{database_port} --dbname #{database_name} --echo-all --file spec/setup_db.sql`
+
+    pg_version = `psql --host #{database_host} --port #{database_port}  --dbname #{database_name} --tuples-only --command "select version()";`.strip
+    puts "Testing with Postgres version: #{pg_version}"
+    puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+
+    database_url = "postgres://#{database_host}:#{database_port}/#{database_name}"
+    puts "Using database #{database_url}"
+    ActiveRecord::Base.establish_connection(database_url)
+    require 'db/schema'
     DatabaseCleaner.clean_with(:truncation)
   end