diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-23 15:30:07 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-23 15:30:07 -0300 |
| commit | 925f6bd546bd719c85b0566157ea5c17cfcd612d (patch) | |
| tree | 853bd60565f2168b537429a9b1ac5f5b04667438 /activerecord | |
| parent | 91305adef8e94c2bbc3b771747dc0fbb00e3a171 (diff) | |
| download | rails-925f6bd546bd719c85b0566157ea5c17cfcd612d.tar.gz rails-925f6bd546bd719c85b0566157ea5c17cfcd612d.tar.bz2 rails-925f6bd546bd719c85b0566157ea5c17cfcd612d.zip | |
PGconn doesn't accepts :checkout_timeout option.
This option was added on cb6f839359bd894feb0a1105b79af72b336aa41e
renaming the :wait_timeout option.
Fix build http://travis-ci.org/#!/rails/rails/jobs/1413405
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 15c3d7be36..8e318a9e94 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -18,7 +18,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, :template, + :schema_order, :adapter, :pool, :checkout_timeout, :template, :reaping_frequency, :insert_returning].each do |key| conn_params.delete key end |