aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Kirby <seank@nulogy.com>2012-02-06 11:19:13 -0500
committerSean Kirby <seank@nulogy.com>2012-02-06 11:19:13 -0500
commit9ed5a1c8f19c1ec707c5aeed24a9505677ee408a (patch)
treeace458e88ace0bf83490d0830c4210933dea4860
parent6e054b16f49cc015ca066093bd5b714fda34d3ab (diff)
downloadrails-9ed5a1c8f19c1ec707c5aeed24a9505677ee408a.tar.gz
rails-9ed5a1c8f19c1ec707c5aeed24a9505677ee408a.tar.bz2
rails-9ed5a1c8f19c1ec707c5aeed24a9505677ee408a.zip
prevents the database.yml template option from being passed to PGConn
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb2
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 fe77eb725e..194c814e5b 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -14,7 +14,7 @@ module ActiveRecord
# Forward any unused config params to PGconn.connect.
[:statement_limit, :encoding, :min_messages, :schema_search_path,
- :schema_order, :adapter, :pool, :wait_timeout,
+ :schema_order, :adapter, :pool, :wait_timeout, :template,
:reaping_frequency].each do |key|
conn_params.delete key
end