diff options
Diffstat (limited to 'activerecord/lib/active_record/transactions.rb')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index ffe7c4ae42..283e1f8736 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -356,7 +356,7 @@ module ActiveRecord if has_transactional_callbacks? self.class.connection.add_transaction_record(self) else - set_transaction_state(self.class.connection.transaction_state) + set_transaction(self.class.connection.current_transaction) end remember_transaction_record_state end @@ -445,8 +445,8 @@ module ActiveRecord private - def set_transaction_state(state) # :nodoc: - @transaction_state = state + def set_transaction(txn) # :nodoc: + @transaction = txn end def has_transactional_callbacks? # :nodoc: @@ -471,12 +471,12 @@ module ActiveRecord # method recursively goes through the parent of the TransactionState and # checks if the ActiveRecord object reflects the state of the object. def sync_with_transaction_state - update_attributes_from_transaction_state(@transaction_state) + update_attributes_from_transaction_state(@transaction) end - def update_attributes_from_transaction_state(transaction_state) - if transaction_state && transaction_state.finalized? - restore_transaction_record_state if transaction_state.rolledback? + def update_attributes_from_transaction_state(transaction) + if transaction && transaction.finalized? + restore_transaction_record_state if transaction.rolledback? clear_transaction_record_state end end |