mirror of
https://github.com/github/rails.git
synced 2026-02-03 10:45:01 -05:00
PostgreSQL: don't ignore port when host is nil since it's often used to label the domain socket. Closes #5247.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4401 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* PostgreSQL: don't ignore port when host is nil since it's often used to label the domain socket. #5247 [shimbo@is.naist.jp]
|
||||
|
||||
* Records and arrays of records are bound as quoted ids. [Jeremy Kemper]
|
||||
Foo.find(:all, :conditions => ['bar_id IN (?)', bars])
|
||||
Foo.find(:first, :conditions => ['bar_id = ?', bar])
|
||||
|
||||
@@ -8,7 +8,7 @@ module ActiveRecord
|
||||
|
||||
config = config.symbolize_keys
|
||||
host = config[:host]
|
||||
port = config[:port] || 5432 unless host.nil?
|
||||
port = config[:port] || 5432
|
||||
username = config[:username].to_s
|
||||
password = config[:password].to_s
|
||||
|
||||
|
||||
Reference in New Issue
Block a user