diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-06 10:13:57 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-06 10:13:57 -0800 |
| commit | 6342cdd6ac7ea07edc3a905cd8ce700f3144c63d (patch) | |
| tree | ace458e88ace0bf83490d0830c4210933dea4860 /activerecord | |
| parent | 6e054b16f49cc015ca066093bd5b714fda34d3ab (diff) | |
| parent | 9ed5a1c8f19c1ec707c5aeed24a9505677ee408a (diff) | |
| download | rails-6342cdd6ac7ea07edc3a905cd8ce700f3144c63d.tar.gz rails-6342cdd6ac7ea07edc3a905cd8ce700f3144c63d.tar.bz2 rails-6342cdd6ac7ea07edc3a905cd8ce700f3144c63d.zip | |
Merge pull request #4910 from sskirby/fixes_regression_in_postgres_template_support
prevents the database.yml template option from being passed to PGConn
Diffstat (limited to 'activerecord')
| -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 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 |