diff options
| author | Arthur Neves <arthurnn@gmail.com> | 2014-05-08 14:46:12 -0400 |
|---|---|---|
| committer | Arthur Neves <arthurnn@gmail.com> | 2014-05-09 13:42:04 -0400 |
| commit | 198d9e3dfb943c309520e98b86d48c113eb5acbb (patch) | |
| tree | f6be413fb9209f552b1f6193bbe599e799058cc5 /activerecord/lib/active_record | |
| parent | 0a7beb1b77711e6b85234f425dfbc5f8c65420e9 (diff) | |
| download | rails-198d9e3dfb943c309520e98b86d48c113eb5acbb.tar.gz rails-198d9e3dfb943c309520e98b86d48c113eb5acbb.tar.bz2 rails-198d9e3dfb943c309520e98b86d48c113eb5acbb.zip | |
Reverts "Fix bugs with changed attributes tracking when transaction gets rollback"
We are reverting these commits, because there are other caveats related
to dirty attributes not being restored when a transaction is rollback.
For instance, nested transactions cannot proper restore the dirty
attributes state after a rollback.
At the moment, the dirty attributes are scoped by the transaction.
When we call `.save` on a record, the dirty attributes will be reset even
if the transaction gets rollback.
[related #13166]
[related #15018]
[related #15016]
[closes #15019]
This reverts commits
* bab48f0a3d53a08bc23ea0887219e8deb963c3d9
* b0fa7cf3ff8432cc2eef3682b34763b7f8c93cc8.
* 73fb39b6faa9de593ae75ad4e3b8e065ea0e53af
* 37c238927fbed059de3f26a90d8923fb377568a5.
* 8d8d4f1560264cd1c74364d67fa0501f6dd2c4fa
Revert "Merge pull request #13166 from bogdan/transaction-magic"
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index e31d28cfd1..17f76b63b3 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -350,7 +350,6 @@ module ActiveRecord end @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) + 1 @_start_transaction_state[:frozen?] = @attributes.frozen? - @_start_transaction_state[:changed_attributes] ||= changed_attributes.dup end # Clear the new record state and id of a record. @@ -369,9 +368,6 @@ module ActiveRecord @attributes = @attributes.dup if @attributes.frozen? @new_record = restore_state[:new_record] @destroyed = restore_state[:destroyed] - changed_attributes.replace(restore_state[:changed_attributes]).delete_if do |attribute, old_value| - old_value == @attributes[attribute] - end if restore_state.has_key?(:id) write_attribute(self.class.primary_key, restore_state[:id]) else |