diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-06 21:31:38 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-06 21:32:48 -0300 |
| commit | ea26229abefb3429e8edbe5ba8313ad3edff23e4 (patch) | |
| tree | 0cd21796c1ae624e6bcae809fb07b9bc3c2e535a | |
| parent | dc4b4c46ef531255276ac6a66cfee5ee03126a9c (diff) | |
| download | rails-ea26229abefb3429e8edbe5ba8313ad3edff23e4.tar.gz rails-ea26229abefb3429e8edbe5ba8313ad3edff23e4.tar.bz2 rails-ea26229abefb3429e8edbe5ba8313ad3edff23e4.zip | |
Remove the configuration key in the correct place
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 72e476be90..8f7f12ab81 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -24,7 +24,7 @@ module ActiveRecord # Forward any unused config params to PGconn.connect. [:statement_limit, :encoding, :min_messages, :schema_search_path, :schema_order, :adapter, :pool, :checkout_timeout, :template, - :reaping_frequency, :insert_returning, :variables].each do |key| + :prepared_statements, :reaping_frequency, :insert_returning, :variables].each do |key| conn_params.delete key end conn_params.delete_if { |k,v| v.nil? } @@ -458,8 +458,6 @@ module ActiveRecord @visitor = BindSubstitution.new self end - connection_parameters.delete :prepared_statements - @connection_parameters, @config = connection_parameters, config # @local_tz is initialized as nil to avoid warnings when connect tries to use it |