diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-26 03:04:14 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-26 03:04:14 -0700 |
commit | e06878c22bad83c234f5c51644c45629de876b25 (patch) | |
tree | a6285cef4ef7d39d231dcbf71df5a773fcb30e89 /activerecord/lib | |
parent | 00d2165f748bc3d7c235daa959c54266a0a283db (diff) | |
parent | ab1e82b8f7279301e4363decdef84719f9304443 (diff) | |
download | rails-e06878c22bad83c234f5c51644c45629de876b25.tar.gz rails-e06878c22bad83c234f5c51644c45629de876b25.tar.bz2 rails-e06878c22bad83c234f5c51644c45629de876b25.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index bc6fd4e722..55c7da5b4f 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -23,8 +23,8 @@ module ActiveRecord config = config.symbolize_keys host = config[:host] port = config[:port] || 5432 - username = config[:username].to_s - password = config[:password].to_s + username = config[:username].to_s if config[:username] + password = config[:password].to_s if config[:password] if config.has_key?(:database) database = config[:database] |