diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2015-01-09 14:07:25 -0800 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2015-01-09 14:07:25 -0800 |
| commit | 82dd93bd5eb6613c6fd8ba0725b30c273aba7008 (patch) | |
| tree | 6a6af3d2486c3099b508fbfb6a4b001f9b9cc6c0 /activerecord | |
| parent | 4e48873a929115a1738c699430994fc60d35b68a (diff) | |
| parent | 86a853e4ec5c8adfa38a4faa5fa5bd68d992c00d (diff) | |
| download | rails-82dd93bd5eb6613c6fd8ba0725b30c273aba7008.tar.gz rails-82dd93bd5eb6613c6fd8ba0725b30c273aba7008.tar.bz2 rails-82dd93bd5eb6613c6fd8ba0725b30c273aba7008.zip | |
Merge pull request #18426 from arthurnn/txn_ref
Copy records to parent transaction should happen on TransactionManager
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 335eb876cf..7535e9147a 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -117,8 +117,6 @@ module ActiveRecord def commit connection.release_savepoint(savepoint_name) super - parent = connection.transaction_manager.current_transaction - records.each { |r| parent.add_record(r) } end def full_rollback?; false; end @@ -166,7 +164,9 @@ module ActiveRecord end def commit_transaction - @stack.pop.commit + transaction = @stack.pop + transaction.commit + transaction.records.each { |r| current_transaction.add_record(r) } end def rollback_transaction |