diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-02 01:25:11 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-02 01:25:11 +0000 |
| commit | 6aaa08d85b4acb89c44e951398e9f6a5e3e0daec (patch) | |
| tree | 90e08a378b0760f5ba5516aa144d922f067506fe /activerecord/lib | |
| parent | ac66cf1289a18504668baffeb1808540103ddc7a (diff) | |
| download | rails-6aaa08d85b4acb89c44e951398e9f6a5e3e0daec.tar.gz rails-6aaa08d85b4acb89c44e951398e9f6a5e3e0daec.tar.bz2 rails-6aaa08d85b4acb89c44e951398e9f6a5e3e0daec.zip | |
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
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index a9c140f27a..594d5c8f43 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -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 |