diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2013-09-03 12:18:41 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-09-03 12:18:41 -0300 |
| commit | c52a4ae565671e3a3b1513a285dc887102d5eb15 (patch) | |
| tree | 645f02f3d82c10b8597ea816675b7f97c0d1f819 /activerecord/lib/active_record/railties | |
| parent | 8436620cb519c0c808fdd006c7c276146fb3b005 (diff) | |
| download | rails-c52a4ae565671e3a3b1513a285dc887102d5eb15.tar.gz rails-c52a4ae565671e3a3b1513a285dc887102d5eb15.tar.bz2 rails-c52a4ae565671e3a3b1513a285dc887102d5eb15.zip | |
Revert "Merge pull request #12085 from valk/master"
This reverts commit 15455d76c8d33b3767a61e0cdd2de0ff592098ef, reversing
changes made to ffa56f73d5ae98fe0b8b6dd2ca6f0dffac9d9217.
Diffstat (limited to 'activerecord/lib/active_record/railties')
| -rw-r--r-- | activerecord/lib/active_record/railties/console_sandbox.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/railties/console_sandbox.rb b/activerecord/lib/active_record/railties/console_sandbox.rb index 1a04950898..604a220303 100644 --- a/activerecord/lib/active_record/railties/console_sandbox.rb +++ b/activerecord/lib/active_record/railties/console_sandbox.rb @@ -1,7 +1,5 @@ ActiveRecord::Base.connection.begin_transaction(joinable: false) at_exit do - if ActiveRecord::Base.connection.transaction_open? - ActiveRecord::Base.connection.rollback_transaction - end + ActiveRecord::Base.connection.rollback_transaction end |