aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJamie Gaskins <jgaskins@gmail.com>2012-05-18 18:42:35 +0800
committerJamie Gaskins <jgaskins@gmail.com>2012-05-19 08:20:08 +0800
commit900dbc54f17500e14e481eab2ebf88acfc5448aa (patch)
treed34cc01afa34e5782eef3cdbcfee6fdc77c827e4 /activerecord
parent88949f8ac1759d07fe8502f863dac20f509163c3 (diff)
downloadrails-900dbc54f17500e14e481eab2ebf88acfc5448aa.tar.gz
rails-900dbc54f17500e14e481eab2ebf88acfc5448aa.tar.bz2
rails-900dbc54f17500e14e481eab2ebf88acfc5448aa.zip
Increase `AR#cache_key` precision to nanoseconds
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/integration.rb2
-rw-r--r--activerecord/test/cases/base_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/integration.rb b/activerecord/lib/active_record/integration.rb
index 2c42f4cca5..23c272ef12 100644
--- a/activerecord/lib/active_record/integration.rb
+++ b/activerecord/lib/active_record/integration.rb
@@ -39,7 +39,7 @@ module ActiveRecord
when new_record?
"#{self.class.model_name.cache_key}/new"
when timestamp = self[:updated_at]
- timestamp = timestamp.utc.to_s(:number)
+ timestamp = timestamp.utc.to_s(:nsec)
"#{self.class.model_name.cache_key}/#{id}-#{timestamp}"
else
"#{self.class.model_name.cache_key}/#{id}"
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 66a16d8b5f..6c347820fe 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1939,7 +1939,7 @@ class BasicsTest < ActiveRecord::TestCase
def test_cache_key_format_for_existing_record_with_updated_at
dev = Developer.first
- assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:number)}", dev.cache_key
+ assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:nsec)}", dev.cache_key
end
def test_cache_key_format_for_existing_record_with_nil_updated_at