diff options
| author | eileencodes <eileencodes@gmail.com> | 2018-02-20 12:58:01 -0500 |
|---|---|---|
| committer | eileencodes <eileencodes@gmail.com> | 2018-02-21 16:01:35 -0500 |
| commit | bf0495de58ed4a0f4f5b5e079c3e758d6b6b132c (patch) | |
| tree | d944a3899e4370c10b70614c4152657b869a63c5 /railties | |
| parent | 23c5558f37c2c55807e7603415214f2b4b7b22c1 (diff) | |
| download | rails-bf0495de58ed4a0f4f5b5e079c3e758d6b6b132c.tar.gz rails-bf0495de58ed4a0f4f5b5e079c3e758d6b6b132c.tar.bz2 rails-bf0495de58ed4a0f4f5b5e079c3e758d6b6b132c.zip | |
Delete default configuration
Because of this default configuration we're constantly checking if the
database exists when looping through configurations. This is unnecessary
and we should just delete it before we need to loop through
configurations.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 46ad3557e3..2c00d92f8f 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -178,6 +178,7 @@ module Rails values.reverse_merge!(shared) end end + loaded_yaml.delete("default") Hash.new(shared).merge(loaded_yaml) elsif ENV["DATABASE_URL"] # Value from ENV['DATABASE_URL'] is set to default database connection |