diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-06-09 17:30:00 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-06-18 19:08:41 +0900 |
| commit | cad0b7d91dbc5abf4b0d7fdbcf2d0620557a3b0f (patch) | |
| tree | 9931a8eb4a452c9de635661cad42353750452c43 /activerecord/lib/active_record/relation.rb | |
| parent | a865f621ee934e8741001bbed1b487698e44d914 (diff) | |
| download | rails-cad0b7d91dbc5abf4b0d7fdbcf2d0620557a3b0f.tar.gz rails-cad0b7d91dbc5abf4b0d7fdbcf2d0620557a3b0f.tar.bz2 rails-cad0b7d91dbc5abf4b0d7fdbcf2d0620557a3b0f.zip | |
Fix `touch` option to behave consistently with `Persistence#touch` method
`touch` option was added to `increment!` (#27660) and `update_counters`
(#26995). But that option behaves inconsistently with
`Persistence#touch` method.
If `touch` option is passed attribute names, it won't update
update_at/on attributes unlike `Persistence#touch` method.
Due to changed from `Persistence#touch` to `increment!` with `touch`
option, #31405 has a regression that `counter_cache` with `touch` option
which is passed attribute names won't update update_at/on attributes.
I think that the inconsistency is not intended. To get back consistency,
ensure that `touch` option updates update_at/on attributes.
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index c055b97061..c911cbe5ec 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -393,10 +393,7 @@ module ActiveRecord # Person.where(name: 'David').touch_all # # => "UPDATE \"people\" SET \"updated_at\" = '2018-01-04 22:55:23.132670' WHERE \"people\".\"name\" = 'David'" def touch_all(*names, time: nil) - attributes = Array(names) + klass.timestamp_attributes_for_update_in_model - time ||= klass.current_time_from_proper_timezone - updates = {} - attributes.each { |column| updates[column] = time } + updates = touch_attributes_with_time(*names, time: time) if klass.locking_enabled? quoted_locking_column = connection.quote_column_name(klass.locking_column) |