Merge pull request #12085 from valk/master

FIX reload! within rails console --sandbox causes undefined method rollb...
rails · Aug 30, 2013 · 1c6556f · 1c6556f
1 parent 26eef6a
commit 1c6556f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/railties/console_sandbox.rb b/activerecord/lib/active_record/railties/console_sandbox.rb
@@ -1,5 +1,7 @@
 ActiveRecord::Base.connection.begin_transaction(joinable: false)
 
 at_exit do
-  ActiveRecord::Base.connection.rollback_transaction
+  if ActiveRecord::Base.connection.transaction_open?
+    ActiveRecord::Base.connection.rollback_transaction
+  end
 end