From f14449d702d77accfee76e2b8e0e7b692b89872e Mon Sep 17 00:00:00 2001 From: Russ Tyndall Date: Fri, 17 Jun 2011 15:47:27 -0400 Subject: [PATCH] made parse-time/datestring handle already parsed time/datestrings --- sql/time.lisp | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sql/time.lisp b/sql/time.lisp index 83e17a0..0bb18c3 100644 --- a/sql/time.lisp +++ b/sql/time.lisp @@ -1189,17 +1189,28 @@ rules" timestring starts with P, read a duration; otherwise read an ISO 8601 formatted date string." (declare (ignore junk-allowed)) - (let ((string (subseq timestring start end))) - (if (char= (aref string 0) #\P) - (parse-iso-8601-duration string) - (parse-iso-8601-time string)))) + (etypecase timestring + (wall-time timestring) + (date (date->time timestring)) + (string + (let ((string (subseq timestring start end))) + (if (char= (aref string 0) #\P) + (parse-iso-8601-duration string) + (parse-iso-8601-time string)))))) (defun parse-datestring (datestring &key (start 0) end junk-allowed) "parse a ISO 8601 timestring and return the corresponding date. Will throw a hissy fit if the date string is a duration. Will ignore any precision beyond day (hour/min/sec/usec)." - (let ((parsed-value (parse-timestring datestring :start start :end end :junk-allowed junk-allowed))) - (ecase (type-of parsed-value) - (wall-time (%make-date :mjd (time-mjd parsed-value)))))) + (etypecase datestring + (date datestring) + (wall-time (time->date datestring)) + (string + (let ((parsed-value + (parse-timestring + datestring :start start :end end :junk-allowed junk-allowed))) + (etypecase parsed-value + (date parsed-value) + (wall-time (time->date parsed-value))))))) (defvar *iso-8601-duration-delimiters* -- 2.34.1