Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

PGconn doesn't accepts :checkout_timeout option.

This option was added on cb6f839
renaming the :wait_timeout option.

Fix build http://travis-ci.org/#!/rails/rails/jobs/1413405
  • Loading branch information...
commit 925f6bd546bd719c85b0566157ea5c17cfcd612d 1 parent 91305ad
Rafael Mendonça França rafaelfranca authored
2  activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
View
@@ -18,7 +18,7 @@ def postgresql_connection(config) # :nodoc:
# 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
Please sign in to comment.
Something went wrong with that request. Please try again.