diff options
| author | Will Jessop <will@willj.net> | 2019-07-08 05:49:58 +0100 |
|---|---|---|
| committer | Will Jessop <will@willj.net> | 2019-07-08 06:00:30 +0100 |
| commit | ff42b21915c08cf44f2c263dfe13c249dd780528 (patch) | |
| tree | 7170c5c0159b5c0c8d0a0202021cd8d16b3700c5 /activerecord/lib/active_record/database_configurations.rb | |
| parent | 7729dfc6ef0bfddcf55c214b86c7e2530024d58a (diff) | |
| download | rails-ff42b21915c08cf44f2c263dfe13c249dd780528.tar.gz rails-ff42b21915c08cf44f2c263dfe13c249dd780528.tar.bz2 rails-ff42b21915c08cf44f2c263dfe13c249dd780528.zip | |
When DATABASE_URL is specified don't trample envs that use a url: key
fixes #36610
Diffstat (limited to 'activerecord/lib/active_record/database_configurations.rb')
| -rw-r--r-- | activerecord/lib/active_record/database_configurations.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb index b917f4e6b7..bf31bb7c22 100644 --- a/activerecord/lib/active_record/database_configurations.rb +++ b/activerecord/lib/active_record/database_configurations.rb @@ -153,11 +153,11 @@ module ActiveRecord def build_url_config(url, configs) env = ActiveRecord::ConnectionHandling::DEFAULT_ENV.call.to_s - if original_config = configs.find(&:for_current_env?) - if original_config.url_config? - configs - else - configs.map do |config| + if configs.find(&:for_current_env?) + configs.map do |config| + if config.url_config? + config + else ActiveRecord::DatabaseConfigurations::UrlConfig.new(config.env_name, config.spec_name, url, config.config) end end |