From ee5fe97ac4edbe1d2d6fbf034a485070286cfebb Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 30 Sep 2005 12:09:13 +0000 Subject: Ticket #2282 - fix parsing of timestamps with time zone git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2426 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../active_record/connection_adapters/abstract/schema_definitions.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb') diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index be13ae96d2..36f282d22a 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -1,3 +1,5 @@ +require 'parsedate' + module ActiveRecord module ConnectionAdapters #:nodoc: # An abstract definition of a column in a table. @@ -78,7 +80,7 @@ module ActiveRecord def string_to_time(string) return string unless string.is_a?(String) - time_array = ParseDate.parsedate(string).compact + time_array = ParseDate.parsedate(string)[0..5] # treat 0000-00-00 00:00:00 as nil Time.send(Base.default_timezone, *time_array) rescue nil end -- cgit v1.2.3