diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-02-13 10:57:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 10:57:05 -0500 |
| commit | be099cc13f6d0240782d7d63bedd4814ad48fb2d (patch) | |
| tree | 10122a2290e9f16dd8f9176c0070f8c117735072 /activerecord/lib/active_record | |
| parent | 2488901da8a4d896003254869a378f0c1b4ed3f2 (diff) | |
| parent | d9b261a340477a291fb404e0cc759821f6d62811 (diff) | |
| download | rails-be099cc13f6d0240782d7d63bedd4814ad48fb2d.tar.gz rails-be099cc13f6d0240782d7d63bedd4814ad48fb2d.tar.bz2 rails-be099cc13f6d0240782d7d63bedd4814ad48fb2d.zip | |
Merge pull request #35244 from palkan/fix/activerecord-database-uri-resolve
Fix database configurations building when DATABASE_URL present
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/database_configurations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb index 73adf66684..654a01f23b 100644 --- a/activerecord/lib/active_record/database_configurations.rb +++ b/activerecord/lib/active_record/database_configurations.rb @@ -157,7 +157,7 @@ module ActiveRecord configs else configs.map do |config| - ActiveRecord::DatabaseConfigurations::UrlConfig.new(env, config.spec_name, url, config.config) + ActiveRecord::DatabaseConfigurations::UrlConfig.new(config.env_name, config.spec_name, url, config.config) end end else |