diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-11-04 13:14:06 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-11-04 13:14:07 -0200 |
| commit | d0d7555e8771414bdcf62ef0192ce8d8b6284219 (patch) | |
| tree | aa061aec64d2ffedc1234d2e198c13805e13a76d /activerecord/lib/active_record/integration.rb | |
| parent | 92c6305954956cd845ebb89f4e1e44522e20a7c1 (diff) | |
| download | rails-d0d7555e8771414bdcf62ef0192ce8d8b6284219.tar.gz rails-d0d7555e8771414bdcf62ef0192ce8d8b6284219.tar.bz2 rails-d0d7555e8771414bdcf62ef0192ce8d8b6284219.zip | |
Refactor logic to grab the max time of the list of timestamp names in #cache_key
Reuse the already existing logic used for grabbing this information from
the updated columns.
Diffstat (limited to 'activerecord/lib/active_record/integration.rb')
| -rw-r--r-- | activerecord/lib/active_record/integration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/integration.rb b/activerecord/lib/active_record/integration.rb index 94abdb3ec7..f88c8e30e6 100644 --- a/activerecord/lib/active_record/integration.rb +++ b/activerecord/lib/active_record/integration.rb @@ -55,8 +55,8 @@ module ActiveRecord when new_record? "#{self.class.model_name.cache_key}/new" when timestamp_names.any? - timestamps = timestamp_names.collect { |method| send(method) }.compact - timestamp = timestamps.max.utc.to_s(cache_timestamp_format) + timestamp = max_updated_column_timestamp(timestamp_names) + timestamp = timestamp.utc.to_s(cache_timestamp_format) "#{self.class.model_name.cache_key}/#{id}-#{timestamp}" when timestamp = max_updated_column_timestamp timestamp = timestamp.utc.to_s(cache_timestamp_format) |