diff options
author | eileencodes <eileencodes@gmail.com> | 2018-02-22 15:40:13 -0500 |
---|---|---|
committer | eileencodes <eileencodes@gmail.com> | 2018-02-22 15:40:13 -0500 |
commit | ae01c921fb12021e46407f6d17ff68528156017d (patch) | |
tree | 6b5d2d089b90bd93454165c65956034ddf75081e /activerecord/lib | |
parent | edb61ca8dcb348563c227f2cfc8d8576216aa9f3 (diff) | |
download | rails-ae01c921fb12021e46407f6d17ff68528156017d.tar.gz rails-ae01c921fb12021e46407f6d17ff68528156017d.tar.bz2 rails-ae01c921fb12021e46407f6d17ff68528156017d.zip |
Revert "Merge pull request #32075 from eileencodes/delete-default-configuration"
This reverts commit 16f279ebd474626577ced858e3626ac4535a33df, reversing
changes made to 6c6a30a7c357ce1eafa093d77d2b08684fe50887.
The config can be named anything, not just default (although all
generated apps will be named default). We can't just delete configs that
don't have a database because that will break three-tier configs. Oh
well.
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/tasks/database_tasks.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb index 0883e80d23..d8e0cd1e30 100644 --- a/activerecord/lib/active_record/tasks/database_tasks.rb +++ b/activerecord/lib/active_record/tasks/database_tasks.rb @@ -315,12 +315,16 @@ module ActiveRecord environments << "test" if environment == "development" ActiveRecord::Base.configurations.slice(*environments).each do |configuration_environment, configuration| + next unless configuration["database"] + yield configuration, configuration_environment end end def each_local_configuration ActiveRecord::Base.configurations.each_value do |configuration| + next unless configuration["database"] + if local_database?(configuration) yield configuration else |