From 121ebf6101bfddb33a0a76e416891e30fe7e527f Mon Sep 17 00:00:00 2001 From: Ivan Schneider Date: Thu, 19 Oct 2023 12:05:29 +0200 Subject: [PATCH] Fix --- test/test_database_schema.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/test/test_database_schema.rb b/test/test_database_schema.rb index d0164aef..c56c6ee9 100644 --- a/test/test_database_schema.rb +++ b/test/test_database_schema.rb @@ -1,14 +1,8 @@ test_adapter = ENV['adapter'] || ENV['ADAPTER'] || 'postgres' +ActiveRecord::Base.connection.execute 'create database "adminium-fixture"' if ENV['CI'] +conn_spec = ActiveRecord::Base.configurations.find_db_config("fixture-#{test_adapter}").configuration_hash Rails.configuration.test_database_conn_spec = - if ENV['CI'] - ActiveRecord::Base.connection.execute 'create database "adminium-fixture"' - conn_spec = ENV['DATABASE_URL'].split('/') - conn_spec[-1] = 'adminium-fixture' - conn_spec.join('/') - else - conn_spec = ActiveRecord::Base.configurations.find_db_config("fixture-#{test_adapter}").configuration_hash - "#{conn_spec[:adapter]}://#{conn_spec[:username]}@#{conn_spec[:host]}/#{conn_spec[:database]}" - end + "#{conn_spec[:adapter]}://#{conn_spec[:username]}@#{conn_spec[:host]}/#{conn_spec[:database]}" ActiveRecord::Base.establish_connection Rails.configuration.test_database_conn_spec ActiveRecord::Schema.verbose = false