aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/connection_specification.rb
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2014-06-14 15:04:34 +0930
committerMatthew Draper <matthew@trebex.net>2014-06-14 15:09:37 +0930
commitcf67031546735651375b7df06bda6721ad57fbe2 (patch)
tree47ba86da193764eaf52aff5257abb1aa3d3c5f82 /activerecord/lib/active_record/connection_adapters/connection_specification.rb
parent7244e57de8793f3f2edd90122a4ef112b60f9be6 (diff)
downloadrails-cf67031546735651375b7df06bda6721ad57fbe2.tar.gz
rails-cf67031546735651375b7df06bda6721ad57fbe2.tar.bz2
rails-cf67031546735651375b7df06bda6721ad57fbe2.zip
Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6
Fixes #15705.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/connection_specification.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/connection_specification.rb2
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 b79d1a4458..2fcb085ab2 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -85,7 +85,7 @@ module ActiveRecord
"password" => uri.password,
"port" => uri.port,
"database" => database_from_path,
- "host" => uri.host })
+ "host" => uri.hostname })
end
end