diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-08-29 11:07:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 11:07:01 -0400 |
| commit | 55133a0e8e618ae9c21e842dcc5554d1a46eb79a (patch) | |
| tree | 85e79065acb3490a746bc20a187c9ff973f793eb /activerecord | |
| parent | 068fe7dc9045856b822833db5cb7cb690e6000d7 (diff) | |
| parent | 6b5df90fb56d86f0cd04a27a94dfe876e21fa001 (diff) | |
| download | rails-55133a0e8e618ae9c21e842dcc5554d1a46eb79a.tar.gz rails-55133a0e8e618ae9c21e842dcc5554d1a46eb79a.tar.bz2 rails-55133a0e8e618ae9c21e842dcc5554d1a46eb79a.zip | |
Merge pull request #33748 from eileencodes/fix-erb-loading-issue-with-db-yaml
Drop load_database_yaml and fix test
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/tasks/database_tasks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb index fd36c0abd2..62c5adac2b 100644 --- a/activerecord/lib/active_record/tasks/database_tasks.rb +++ b/activerecord/lib/active_record/tasks/database_tasks.rb @@ -135,7 +135,7 @@ module ActiveRecord end def for_each - databases = Rails.application.config.load_database_yaml + databases = Rails.application.config.database_configuration database_configs = ActiveRecord::DatabaseConfigurations.configs_for(Rails.env, databases) # if this is a single database application we don't want tasks for each primary database |