diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-18 17:30:35 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-10 15:33:01 -0300 |
| commit | 09a8b146ef9e038d6036a21fb4f80e15f9ee969a (patch) | |
| tree | 4d9ccc8225360b8df1dc15e2e696dbc636e20330 /activerecord | |
| parent | cc9958026409d7a4b76af555c0240db4428a071b (diff) | |
| download | rails-09a8b146ef9e038d6036a21fb4f80e15f9ee969a.tar.gz rails-09a8b146ef9e038d6036a21fb4f80e15f9ee969a.tar.bz2 rails-09a8b146ef9e038d6036a21fb4f80e15f9ee969a.zip | |
Merge pull request #6376 from jgaskins/timestamp-microseconds
Increase numeric-timestamp precision to nanoseconds
Conflicts:
activesupport/lib/active_support/core_ext/time/conversions.rb
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 d145486f64..8c89fb8b6e 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -2151,7 +2151,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 |