kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Respect cache timestamp format when giving timestamps to #cache_key

Browse source
This commit is contained in:
Carlos Antonio da Silva 2013-11-04 13:06:53 -02:00
parent 91d72fe652
commit 92c6305954
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
activerecord/lib/active_record/integration.rb
View file

@ -56,7 +56,8 @@ module ActiveRecord
"#{self.class.model_name.cache_key}/new"
when timestamp_names.any?
timestamps = timestamp_names.collect { |method| send(method) }.compact
"#{self.class.model_name.cache_key}/#{id}-#{timestamps.max.utc.to_s(:number)}"
timestamp = timestamps.max.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)
"#{self.class.model_name.cache_key}/#{id}-#{timestamp}"

2
activerecord/test/cases/integration_test.rb
View file

@ -85,6 +85,6 @@ class IntegrationTest < ActiveRecord::TestCase
def test_named_timestamps_for_cache_key
owner = owners(:blackbeard)
assert_equal "owners/#{owner.id}-#{owner.happy_at.utc.to_s(:number)}", owner.cache_key(:updated_at, :happy_at)
assert_equal "owners/#{owner.id}-#{owner.happy_at.utc.to_s(:nsec)}", owner.cache_key(:updated_at, :happy_at)
end
end