diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-03-02 11:55:18 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-03-02 11:55:18 -0800 |
| commit | 07278519bb6db5579171fea70bccdfee1306f1d4 (patch) | |
| tree | e37c40df15714fc3338d082239ddbf329b439e05 /activerecord/lib/active_record/core.rb | |
| parent | 0814bb62e5128aff7bfa55211efbd10ad3e37c07 (diff) | |
| download | rails-07278519bb6db5579171fea70bccdfee1306f1d4.tar.gz rails-07278519bb6db5579171fea70bccdfee1306f1d4.tar.bz2 rails-07278519bb6db5579171fea70bccdfee1306f1d4.zip | |
Revert "mutate the transaction object to reflect state"
This reverts commit 393e65b4170608593ad82377a9eadc918e85698d and
ec51c3fedd16b561d096dcc1a6705fdc02ab7666
We don't want the records to hold hard references to transactions
because they point at records that have callbacks.
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index a89931b157..97ce4642aa 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -503,7 +503,7 @@ module ActiveRecord @new_record = true @txn = nil @_start_transaction_state = {} - @transaction = nil + @transaction_state = nil end def initialize_internals_callback |