aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2013-03-08 13:34:58 +0000
committerJon Leighton <j@jonathanleighton.com>2013-03-08 13:58:56 +0000
commitbe3e10cd26bc8ec29c6474d03a08a8e733108e7d (patch)
treed67ac48af90668003caa2551ba40ed8b94637bf1 /activerecord
parentba6b3c165f121d080fe59cf227c9823e0bebc186 (diff)
downloadrails-be3e10cd26bc8ec29c6474d03a08a8e733108e7d.tar.gz
rails-be3e10cd26bc8ec29c6474d03a08a8e733108e7d.tar.bz2
rails-be3e10cd26bc8ec29c6474d03a08a8e733108e7d.zip
Fix rails console --sandbox
I've also added a proper acceptance test which reproduced the issue. Closes #9513, #9515.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/railties/console_sandbox.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railties/console_sandbox.rb b/activerecord/lib/active_record/railties/console_sandbox.rb
index 90b462fad6..25a591aa43 100644
--- a/activerecord/lib/active_record/railties/console_sandbox.rb
+++ b/activerecord/lib/active_record/railties/console_sandbox.rb
@@ -1,4 +1,4 @@
-ActiveRecord::Base.connection.begin_db_transaction
+ActiveRecord::Base.connection.begin_transaction
at_exit do
- ActiveRecord::Base.connection.rollback_db_transaction
+ ActiveRecord::Base.connection.rollback_transaction
end