aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/connection_specification.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-08-10 06:36:39 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-08-10 06:36:39 +0900
commitf006de5dc5a709f5dc8604ebd43f7741da30cd9f (patch)
tree94789c1c7f3c8e1c611a30548cd90ecbb34f98ea /activerecord/lib/active_record/connection_adapters/connection_specification.rb
parent67d0c9ee93100dbdcafd20b0632e5bef6735888e (diff)
downloadrails-f006de5dc5a709f5dc8604ebd43f7741da30cd9f.tar.gz
rails-f006de5dc5a709f5dc8604ebd43f7741da30cd9f.tar.bz2
rails-f006de5dc5a709f5dc8604ebd43f7741da30cd9f.zip
Fix broken alignments caused by auto-correct commit 411ccbd
Hash syntax auto-correcting breaks alignments. 411ccbdab2608c62aabdb320d52cb02d446bb39c
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/connection_specification.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/connection_specification.rb6
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,