aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Kanis <kanis@comcard.de>2012-01-05 12:58:51 +0100
committerLars Kanis <kanis@comcard.de>2012-01-05 12:58:51 +0100
commit92a3c487bb0d125c437e53a7f45c31fcca97f2d9 (patch)
treea57cb44a8fc879c88ecf2e874eab13d16a9a6094
parent8aaf9719dadc3696b939f3429d57973d00df40d9 (diff)
downloadrails-92a3c487bb0d125c437e53a7f45c31fcca97f2d9.tar.gz
rails-92a3c487bb0d125c437e53a7f45c31fcca97f2d9.tar.bz2
rails-92a3c487bb0d125c437e53a7f45c31fcca97f2d9.zip
Postgresql: restore previous behaviour regarding to nil values in connection specification Hash
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 859987fbe9..cf86caa21e 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -16,6 +16,7 @@ module ActiveRecord
conn_params = config.except(:statement_limit, :encoding, :min_messages,
:schema_search_path, :schema_order,
:adapter, :pool, :wait_timeout)
+ conn_params.delete_if { |k,v| v.nil? }
# Map ActiveRecords param names to PGs.
conn_params[:user] = conn_params.delete(:username) if conn_params[:username]