diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-06-27 13:37:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 13:37:32 -0400 |
| commit | 04d2fda1f82272c7ab5318a89e269c46a01c71b8 (patch) | |
| tree | c39f1fbdc9f0b542d0070fc90b30abb7dd86c630 /activerecord/lib | |
| parent | 7e08b6d2b2b67edbd0314b3a15c9ed5633f1c753 (diff) | |
| parent | f2ad69fe7a605b01bb7c37eeac6a9b4e7deb488e (diff) | |
| download | rails-04d2fda1f82272c7ab5318a89e269c46a01c71b8.tar.gz rails-04d2fda1f82272c7ab5318a89e269c46a01c71b8.tar.bz2 rails-04d2fda1f82272c7ab5318a89e269c46a01c71b8.zip | |
Merge pull request #36565 from rails/fix-url-configs
Fix broken url configs
Diffstat (limited to 'activerecord/lib')
| -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 44b5cfc738..b917f4e6b7 100644 --- a/activerecord/lib/active_record/database_configurations.rb +++ b/activerecord/lib/active_record/database_configurations.rb @@ -141,7 +141,7 @@ module ActiveRecord 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 }) + elsif config["database"] || config["adapter"] || ENV["DATABASE_URL"] ActiveRecord::DatabaseConfigurations::HashConfig.new(env_name, spec_name, config) else config.each_pair.map do |sub_spec_name, sub_config| |