Move sandbox to AR and pass the sandbox as a value. This way, other ORMs like Datamapper can also have their own sandboxing in rails console.

2 files changed, 8 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 276f674cc3..bae2ded244 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -29,7 +29,8 @@ module ActiveRecord
     # When loading console, force ActiveRecord::Base to be loaded
     # to avoid cross references when loading a constant for the
     # first time. Also, make it output to STDERR.
-    console do
+    console do |sandbox|
+      require "active_record/railties/console_sandbox" if sandbox
       ActiveRecord::Base.logger = Logger.new(STDERR)
     end
 
diff --git a/activerecord/lib/active_record/railties/console_sandbox.rb b/activerecord/lib/active_record/railties/console_sandbox.rb
new file mode 100644
index 0000000000..65a3d68619
--- /dev/null
+++ b/activerecord/lib/active_record/railties/console_sandbox.rb
@@ -0,0 +1,6 @@
+ActiveRecord::Base.connection.increment_open_transactions
+ActiveRecord::Base.connection.begin_db_transaction
+at_exit do
+  ActiveRecord::Base.connection.rollback_db_transaction
+  ActiveRecord::Base.connection.decrement_open_transactions
+end