diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-08-09 23:53:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 23:53:54 +0200 |
| commit | 7b31b06d4afd73734ac54cbbac105f0eab8d0d43 (patch) | |
| tree | 94789c1c7f3c8e1c611a30548cd90ecbb34f98ea /activerecord/lib/active_record/connection_adapters/connection_specification.rb | |
| parent | 67d0c9ee93100dbdcafd20b0632e5bef6735888e (diff) | |
| parent | f006de5dc5a709f5dc8604ebd43f7741da30cd9f (diff) | |
| download | rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.gz rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.bz2 rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.zip | |
Merge pull request #26095 from kamipo/fix_broken_alignment_by_auto_correct
Fix broken alignments caused by auto-correct commit 411ccbd
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/connection_specification.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/connection_specification.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb index a7869f44ea..be6b55e53c 100644 --- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb @@ -78,10 +78,12 @@ module ActiveRecord def raw_config if uri.opaque - query_hash.merge( "adapter" => @adapter, + query_hash.merge( + "adapter" => @adapter, "database" => uri.opaque) else - query_hash.merge( "adapter" => @adapter, + query_hash.merge( + "adapter" => @adapter, "username" => uri.user, "password" => uri.password, "port" => uri.port, |