diff options
author | Arthur Neves <arthurnn@gmail.com> | 2015-03-01 22:21:24 -0500 |
---|---|---|
committer | Arthur Neves <arthurnn@gmail.com> | 2015-03-01 22:21:58 -0500 |
commit | afd1a870f8046e96010052c8db6b8f40d5c3ef02 (patch) | |
tree | 94aa5a2c8d4c2a7c1b06ae30511c8d5512d36247 /activerecord | |
parent | 4e68681ca8a922a492c9d7b30734732610785956 (diff) | |
download | rails-afd1a870f8046e96010052c8db6b8f40d5c3ef02.tar.gz rails-afd1a870f8046e96010052c8db6b8f40d5c3ef02.tar.bz2 rails-afd1a870f8046e96010052c8db6b8f40d5c3ef02.zip |
Remove parent transaction state
As far as I can tell nobody is setting this variable.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | 3 | ||||
-rw-r--r-- | activerecord/lib/active_record/core.rb | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 3a1e4a4a88..ebb4a1523f 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -1,13 +1,10 @@ module ActiveRecord module ConnectionAdapters class TransactionState - attr_reader :parent - VALID_STATES = Set.new([:committed, :rolledback, nil]) def initialize(state = nil) @state = state - @parent = nil end def finalized? diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index e1a72baff0..cd8ee87f01 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -521,10 +521,6 @@ module ActiveRecord clear_transaction_record_state @reflects_state[depth] = true end - - if transaction_state.parent - update_attributes_from_transaction_state(transaction_state.parent, depth+1) - end end end |