From 8f387995054d9ce79522da8ef65fba28c6ea0785 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Tue, 20 May 2014 14:07:58 -0700 Subject: Inline typecasting helpers from Column to the appropriate types --- .../connection_adapters/type/date_time.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/connection_adapters/type/date_time.rb') diff --git a/activerecord/lib/active_record/connection_adapters/type/date_time.rb b/activerecord/lib/active_record/connection_adapters/type/date_time.rb index 757553cd68..c34f4c5a53 100644 --- a/activerecord/lib/active_record/connection_adapters/type/date_time.rb +++ b/activerecord/lib/active_record/connection_adapters/type/date_time.rb @@ -11,7 +11,23 @@ module ActiveRecord private def cast_value(string) - Column.string_to_time(string) + return string unless string.is_a?(::String) + return if string.empty? + + fast_string_to_time(string) || fallback_string_to_time(string) + end + + # '0.123456' -> 123456 + # '1.123456' -> 123456 + def microseconds(time) + time[:sec_fraction] ? (time[:sec_fraction] * 1_000_000).to_i : 0 + end + + def fallback_string_to_time(string) + time_hash = ::Date._parse(string) + time_hash[:sec_fraction] = microseconds(time_hash) + + new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset)) end end end -- cgit v1.2.3