diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-29 16:24:17 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-29 16:24:17 -0300 |
| commit | 160cc6956c3c9da0eab66546d3c266d9f317bbc1 (patch) | |
| tree | 1768165cffcb17a55822c9d39eeae3f5599855e0 /activerecord/lib/active_record/connection_adapters/abstract | |
| parent | d7b726be00379a8e03e443425fba05341c6104cd (diff) | |
| parent | dd9829a9ea460ddcfc8d954f2b95161b52fff6e7 (diff) | |
| download | rails-160cc6956c3c9da0eab66546d3c266d9f317bbc1.tar.gz rails-160cc6956c3c9da0eab66546d3c266d9f317bbc1.tar.bz2 rails-160cc6956c3c9da0eab66546d3c266d9f317bbc1.zip | |
Merge pull request #16335 from arthurnn/rm_parent_state_trasaction
Remove @state.parent assignment on commit
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 3a266512a9..33cc22425d 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -72,7 +72,7 @@ module ActiveRecord end class TransactionState - attr_accessor :parent + attr_reader :parent VALID_STATES = Set.new([:committed, :rolledback, nil]) @@ -245,7 +245,6 @@ module ActiveRecord def perform_commit @state.set_state(:committed) - @state.parent = parent.state connection.release_savepoint(@savepoint_name) end end |