From 0979713abe2e22083e1beca01a1d113408c9ab36 Mon Sep 17 00:00:00 2001 From: eileencodes Date: Thu, 22 Feb 2018 07:56:09 -0500 Subject: Reject empty database yamls In #32075 I deleted the default configuration since that's what's generated with the Rails app. Since someone could change the default name instead delete any config that doesn't have a database so we can avoid peppering our Rails tasks with conditionals to deal with invalid database configs. --- railties/lib/rails/application/configuration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 84595342b2..9fbcea1b81 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -178,7 +178,7 @@ module Rails values.reverse_merge!(shared) end end - loaded_yaml.delete("default") + loaded_yaml.reject! { |_, values| !values["database"] } Hash.new(shared).merge(loaded_yaml) elsif ENV["DATABASE_URL"] # Value from ENV['DATABASE_URL'] is set to default database connection -- cgit v1.2.3