diff options
| -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 |