diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-18 17:30:35 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-18 17:30:35 -0700 |
| commit | 98657ad10c0bd799b8b314b9af3f0495267b2ddb (patch) | |
| tree | 23065a3f15c2eec758db07ac7746a1bec993caee /activerecord | |
| parent | 49b72fa864364b081770c52d1b0847eac00b2be2 (diff) | |
| parent | 900dbc54f17500e14e481eab2ebf88acfc5448aa (diff) | |
| download | rails-98657ad10c0bd799b8b314b9af3f0495267b2ddb.tar.gz rails-98657ad10c0bd799b8b314b9af3f0495267b2ddb.tar.bz2 rails-98657ad10c0bd799b8b314b9af3f0495267b2ddb.zip | |
Merge pull request #6376 from jgaskins/timestamp-microseconds
Increase numeric-timestamp precision to nanoseconds
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/integration.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 2 |
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 a7c1881561..619fb881fa 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1921,7 +1921,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 |