diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-01-16 09:24:18 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-01-16 09:24:18 -0200 |
| commit | 73ba2c14cd7d7dfb2d132b18c47ade995401736f (patch) | |
| tree | b11d50e60d48cd028ffbacfca34b5174a093301e /activerecord/lib | |
| parent | fbab7b2acc1db4b8f1a9212350721b7716e74ac8 (diff) | |
| parent | 177989c6c0bfaffbb9dbf034b3b01d6e3edf1429 (diff) | |
| download | rails-73ba2c14cd7d7dfb2d132b18c47ade995401736f.tar.gz rails-73ba2c14cd7d7dfb2d132b18c47ade995401736f.tar.bz2 rails-73ba2c14cd7d7dfb2d132b18c47ade995401736f.zip | |
Merge branch 'ca-touch-commit-callbacks'
Make AR::Base#touch fire the after_commit and after_rollback callbacks.
Closes #12031.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 3f6f4748c6..c33ffeece0 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -273,6 +273,10 @@ module ActiveRecord with_transaction_returning_status { super } end + def touch(*) #:nodoc: + with_transaction_returning_status { super } + end + # Reset id and @new_record if the transaction rolls back. def rollback_active_record_state! remember_transaction_record_state |