aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
diff options
context:
space:
mode:
authorSteve Jorgensen <stevej@renewfund.com>2012-06-06 17:31:23 -0700
committerSteve Jorgensen <stevej@renewfund.com>2012-09-13 14:57:59 -0700
commitf48bb016a7930eb3279f64d896ef2a401d301263 (patch)
tree9bb837971a232bc365cc18adcfeac675553b359d /activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
parentf568280ba49e95c05bfa5e27fa75f0cf6029cd09 (diff)
downloadrails-f48bb016a7930eb3279f64d896ef2a401d301263.tar.gz
rails-f48bb016a7930eb3279f64d896ef2a401d301263.tar.bz2
rails-f48bb016a7930eb3279f64d896ef2a401d301263.zip
Backport PostgreSQL auto-reconnect test coverage
6d5f4de4c420ebb906109668f5702a537ac77692 Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests. 4b1bca04025a66c54e6e9d5eb6e4d4056bfa92f0 Stop being silly with formatting of method aliasing. c381d5cbf959208adeb38e7859ee815dfbd2cf54 Fix just-plain-wrongness of psql auto-reconnect test. 1e17a9d367c54c680368be72f44247ae28b98904 Fix only-once stub logic. f16c2043826ec1991cf94fe17cb671507b7a7f51 Changelog for PostgreSQL auto-reconnect test coverage backport.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 3dfd150d5a..a22ccfab86 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -354,6 +354,7 @@ module ActiveRecord
def reconnect!
clear_cache!
@connection.reset
+ @open_transactions = 0
configure_connection
end