diff options
| author | a3gis <henri.maurer@gmail.com> | 2014-07-24 14:21:55 +0100 |
|---|---|---|
| committer | a3gis <henri.maurer@gmail.com> | 2014-07-24 14:21:55 +0100 |
| commit | 98d2421ef937a819ef8dadc94ba519842e33e7b6 (patch) | |
| tree | 2ef85b63cd677b502439b1bc811035fd553d8efe | |
| parent | 7e20b9449a8fd0daed938b52dd4ac513b13352cd (diff) | |
| download | rails-98d2421ef937a819ef8dadc94ba519842e33e7b6.tar.gz rails-98d2421ef937a819ef8dadc94ba519842e33e7b6.tar.bz2 rails-98d2421ef937a819ef8dadc94ba519842e33e7b6.zip | |
Fixes #16265
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/connection_specification.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb index 2fcb085ab2..7082989f68 100644 --- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb @@ -250,7 +250,7 @@ module ActiveRecord # Connection details inside of the "url" key win any merge conflicts def resolve_hash_connection(spec) if spec["url"] && spec["url"] !~ /^jdbc:/ - connection_hash = resolve_string_connection(spec.delete("url")) + connection_hash = resolve_url_connection(spec.delete("url")) spec.merge!(connection_hash) end spec |