13996: Don't override name of test db if one was provided in database.yml

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index a9733bc7acf501b3252bdb3846759439e014f012..f0eb55a8f3b91afe6723fcecb8579c60d3634fb8 100644 (file)
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -175,12 +175,11 @@ end
 db_config = {}
 path = "#{::Rails.root.to_s}/config/database.yml"
 if File.exist? path
-  confs = ConfigLoader.load(path)
-  db_config.deep_merge!(confs[::Rails.env.to_s] || {})
+  db_config = ConfigLoader.load(path)
 end
 
 $remaining_config = arvcfg.migrate_config(application_config, $arvados_config)
-dbcfg.migrate_config(db_config, $arvados_config)
+dbcfg.migrate_config(db_config[::Rails.env.to_s] || {}, $arvados_config)
 
 if application_config[:auto_activate_users_from]
   application_config[:auto_activate_users_from].each do |cluster|
@@ -196,10 +195,11 @@ arvcfg.coercion_and_check $arvados_config
 dbcfg.coercion_and_check $arvados_config
 
 #
-# Special case for test database, because the Arvados config.yml
-# doesn't have a concept of multiple rails environments.
+# Special case for test database where there's no database.yml,
+# because the Arvados config.yml doesn't have a concept of multiple
+# rails environments.
 #
-if ::Rails.env.to_s == "test"
+if ::Rails.env.to_s == "test" && db_config["test"].nil?
   $arvados_config["PostgreSQL"]["Connection"]["DBName"] = "arvados_test"
 end