aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/fixtures.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-12-05 19:58:11 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-12-05 19:58:11 +0000
commitb13573ed3796508f224f0b86f13462272c212fe3 (patch)
treec44c9a5c4aaf9094513c6b72bc5ba0edd9fa4a35 /activerecord/lib/active_record/fixtures.rb
parent0632f5a93e20955cedc8834cec0bfe1cddb1bdd7 (diff)
downloadrails-b13573ed3796508f224f0b86f13462272c212fe3.tar.gz
rails-b13573ed3796508f224f0b86f13462272c212fe3.tar.bz2
rails-b13573ed3796508f224f0b86f13462272c212fe3.zip
Clear connection cache after rolling back transaction.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3221 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
-rwxr-xr-xactiverecord/lib/active_record/fixtures.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 3adbd9b228..2c3609aa77 100755
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -503,13 +503,12 @@ module Test #:nodoc:
alias_method :setup, :setup_with_fixtures
def teardown_with_fixtures
- ActiveRecord::Base.clear_connection_cache!
- ensure
# Rollback changes.
if use_transactional_fixtures?
ActiveRecord::Base.connection.rollback_db_transaction
ActiveRecord::Base.unlock_mutex
end
+ ActiveRecord::Base.clear_connection_cache!
end
alias_method :teardown, :teardown_with_fixtures