diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-05-13 22:42:24 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2019-05-13 23:30:05 +0900 |
| commit | dcb825902d79d0f6baba956f7c6ec5767611353e (patch) | |
| tree | ed378d749fa4a075f5e380b1b05a82ffe4697fb8 /activerecord/lib/active_record | |
| parent | 9854efd5ac6a05555cc73b21c98c37252eaef0a6 (diff) | |
| download | rails-dcb825902d79d0f6baba956f7c6ec5767611353e.tar.gz rails-dcb825902d79d0f6baba956f7c6ec5767611353e.tar.bz2 rails-dcb825902d79d0f6baba956f7c6ec5767611353e.zip | |
Don't track implicit `touch` mutation
This partly reverts the effect of d1107f4d.
d1107f4d makes `touch` tracks the mutation whether the `touch` is
occurred by explicit or not.
Existing apps expects that the previous changes tracks only the changes
which is explicit action by users.
I'd revert the implicit `touch` mutation tracking since I'd not like to
break existing apps.
Fixes #36219.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/dirty.rb | 7 | ||||
| -rw-r--r-- | activerecord/lib/active_record/touch_later.rb | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb index a43ebdf60d..45341765c1 100644 --- a/activerecord/lib/active_record/attribute_methods/dirty.rb +++ b/activerecord/lib/active_record/attribute_methods/dirty.rb @@ -177,6 +177,11 @@ module ActiveRecord affected_rows = super + if @_skip_dirty_tracking ||= false + clear_attribute_changes(@_touch_attr_names) + return affected_rows + end + changes = {} @attributes.keys.each do |attr_name| next if @_touch_attr_names.include?(attr_name) @@ -193,7 +198,7 @@ module ActiveRecord affected_rows ensure - @_touch_attr_names = nil + @_touch_attr_names, @_skip_dirty_tracking = nil, nil end def _update_record(attribute_names = attribute_names_for_partial_writes) diff --git a/activerecord/lib/active_record/touch_later.rb b/activerecord/lib/active_record/touch_later.rb index 6872b7844e..bc63c8d987 100644 --- a/activerecord/lib/active_record/touch_later.rb +++ b/activerecord/lib/active_record/touch_later.rb @@ -44,6 +44,7 @@ module ActiveRecord def touch_deferred_attributes if has_defer_touch_attrs? && persisted? + @_skip_dirty_tracking = true touch(*@_defer_touch_attrs, time: @_touch_time) @_defer_touch_attrs, @_touch_time = nil, nil end |