aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/connection_specification.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/connection_specification.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/connection_specification.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
index dbb0a95444..996075e08a 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -79,17 +79,15 @@ module ActiveRecord
def raw_config
if uri.opaque
- query_hash.merge({
- "adapter" => @adapter,
- "database" => uri.opaque })
+ 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,
"database" => database_from_path,
- "host" => uri.hostname })
+ "host" => uri.hostname)
end
end