From 3f1aad8ac958419c11703140e697a4dfc245b161 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 30 Sep 2005 04:34:07 +0000 Subject: No need to string.to_s right after checking that string.is_a?(String) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2418 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../connection_adapters/abstract/schema_definitions.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (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 ffd0359274..be13ae96d2 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -71,21 +71,21 @@ module ActiveRecord private def string_to_date(string) return string unless string.is_a?(String) - date_array = ParseDate.parsedate(string.to_s) + date_array = ParseDate.parsedate(string) # treat 0000-00-00 as nil Date.new(date_array[0], date_array[1], date_array[2]) rescue nil end def string_to_time(string) return string unless string.is_a?(String) - time_array = ParseDate.parsedate(string.to_s).compact + time_array = ParseDate.parsedate(string).compact # treat 0000-00-00 00:00:00 as nil Time.send(Base.default_timezone, *time_array) rescue nil end def string_to_dummy_time(string) return string unless string.is_a?(String) - time_array = ParseDate.parsedate(string.to_s) + time_array = ParseDate.parsedate(string) # pad the resulting array with dummy date information time_array[0] = 2000; time_array[1] = 1; time_array[2] = 1; Time.send(Base.default_timezone, *time_array) rescue nil -- cgit v1.2.3