diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-11-07 23:25:07 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 23:25:07 +0900 |
| commit | d84bc2b169cc0b67abe9e7efe7aa301fca570aa7 (patch) | |
| tree | 55d8ae14eac6938c4ffc97f88c75dba4b7125f30 /activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | |
| parent | 8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38 (diff) | |
| parent | 9030b7c7751ba8375697baaee461b1a6435ad5fe (diff) | |
| download | rails-d84bc2b169cc0b67abe9e7efe7aa301fca570aa7.tar.gz rails-d84bc2b169cc0b67abe9e7efe7aa301fca570aa7.tar.bz2 rails-d84bc2b169cc0b67abe9e7efe7aa301fca570aa7.zip | |
Merge pull request #34393 from eugeneius/always_add_to_parent_transaction
Always add records to parent of nested transaction
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/transaction.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 564b226b39..0f2b1e85ff 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -137,7 +137,7 @@ module ActiveRecord record.committed! else # if not running callbacks, only adds the record to the parent transaction - record.add_to_transaction + connection.add_transaction_record(record) end end ensure |