From 09a8b146ef9e038d6036a21fb4f80e15f9ee969a Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 18 May 2012 17:30:35 -0700
Subject: Merge pull request #6376 from jgaskins/timestamp-microseconds

Increase numeric-timestamp precision to nanoseconds
Conflicts:
	activesupport/lib/active_support/core_ext/time/conversions.rb
---
 activesupport/lib/active_support/core_ext/time/conversions.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activesupport/lib/active_support/core_ext/time/conversions.rb')

diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index 49ac18d245..cb175e8751 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -6,6 +6,7 @@ class Time
   DATE_FORMATS = {
     :db           => "%Y-%m-%d %H:%M:%S",
     :number       => "%Y%m%d%H%M%S",
+    :nsec         => '%Y%m%d%H%M%S%9N',
     :time         => "%H:%M",
     :short        => "%d %b %H:%M",
     :long         => "%B %d, %Y %H:%M",
-- 
cgit v1.2.3