diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-01-30 10:26:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 10:26:46 -0500 |
| commit | 677b658d635f7bd5d39a56afc43e4c7e55989ad6 (patch) | |
| tree | 02feabc1c3dd193c70cb1c1601ddc8f56f8311c2 /activerecord/lib/active_record/database_configurations.rb | |
| parent | 9f8438a99f66136924bccf2c41bbc11c3ba69c3a (diff) | |
| parent | dedcc1950613b4c756ca7fdc449d0d9315bb39aa (diff) | |
| download | rails-677b658d635f7bd5d39a56afc43e4c7e55989ad6.tar.gz rails-677b658d635f7bd5d39a56afc43e4c7e55989ad6.tar.bz2 rails-677b658d635f7bd5d39a56afc43e4c7e55989ad6.zip | |
Merge pull request #35102 from eileencodes/fix-case-when-url-in-url-config-is-nil
Fix case when we want a UrlConfig but the URL is nil
Diffstat (limited to 'activerecord/lib/active_record/database_configurations.rb')
| -rw-r--r-- | activerecord/lib/active_record/database_configurations.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb index 11aed6c002..73adf66684 100644 --- a/activerecord/lib/active_record/database_configurations.rb +++ b/activerecord/lib/active_record/database_configurations.rb @@ -134,9 +134,11 @@ module ActiveRecord end def build_db_config_from_hash(env_name, spec_name, config) - if url = config["url"] + if config.has_key?("url") + url = config["url"] config_without_url = config.dup config_without_url.delete "url" + ActiveRecord::DatabaseConfigurations::UrlConfig.new(env_name, spec_name, url, config_without_url) elsif config["database"] || (config.size == 1 && config.values.all? { |v| v.is_a? String }) ActiveRecord::DatabaseConfigurations::HashConfig.new(env_name, spec_name, config) |