diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-03-06 13:02:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-06 13:02:48 -0500 |
| commit | a2bc42f1e78fbc48f7810abf5970268ccefaf021 (patch) | |
| tree | e4f10993ef691b4be4ec6f8908132423a6577ef2 /activerecord | |
| parent | 1818c4e8b49d053ca7a220288dd6823984bc0328 (diff) | |
| parent | 37d1429ab1da78a3b8afcfcec8a135ac85cd897a (diff) | |
| download | rails-a2bc42f1e78fbc48f7810abf5970268ccefaf021.tar.gz rails-a2bc42f1e78fbc48f7810abf5970268ccefaf021.tar.bz2 rails-a2bc42f1e78fbc48f7810abf5970268ccefaf021.zip | |
Merge pull request #35497 from eileencodes/parse-yaml-without-erb-for-rake-tasks
Load YAML for rake tasks without parsing ERB
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 ef02ca8190..a8433fa0db 100644 --- a/activerecord/lib/active_record/tasks/database_tasks.rb +++ b/activerecord/lib/active_record/tasks/database_tasks.rb @@ -142,7 +142,7 @@ module ActiveRecord end def for_each - databases = Rails.application.config.database_configuration + databases = Rails.application.config.load_database_yaml database_configs = ActiveRecord::DatabaseConfigurations.new(databases).configs_for(env_name: Rails.env) # if this is a single database application we don't want tasks for each primary database |