- ((null type) val) ;;we have no desired type, just give the value
- ((typep val type) val) ;;check that it hasn't already been converted.
- ((typep val 'string) (read-from-string val)) ;;maybe read will just take care of it?
- (T (error "Unable to read-sql-value ~a as type ~a" val type))))
-
-(defmethod read-sql-value (val (type symbol) database db-type
- ;; never eval while reading values
- &aux *read-eval*)
- ;; TODO: All the read-from-strings in here do not check that
- ;; what we read was of the correct type, should this change?
- (unless (or (equalp "nil" val) (eql 'null val))
- (case type
- ((string varchar) val)
- (char (etypecase val
- (string (schar val 0))
- (character val)))
- (keyword
- (when (< 0 (length val))
- (intern (symbol-name-default-case val) :keyword)))
- (symbol
- (when (< 0 (length val))
- (intern (symbol-name-default-case val))))
- ((smallint mediumint bigint integer universal-time)
- (etypecase val
- (string (parse-integer val))
- (number val)))
- ((double-float float)
- ;; ensure that whatever we got is coerced to a float of the correct
- ;; type (eg: 1=>1.0d0)
- (float
- (etypecase val
- (string (let ((*read-default-float-format*
- (ecase type
- (float 'single-float)
- (double-float 'double-float))))
- (read-from-string val)))
- (float val))
- (if (eql type 'double-float) 1.0d0 1.0s0)))
- (number
- (etypecase val
+ ;; null value or type
+ ((or (null val)
+ (equalp "nil" val)
+ (eql 'null val)
+ (eql 'null type))
+ nil)
+
+ ;; no specified type or already the right type
+ ((or (null type)
+ (ignore-errors (typep val type)))
+ val)
+
+ ;; actually convert
+ (t
+ (let ((res (handler-bind
+ ;; all errors should be converted to sql-value-conversion-error
+ ((error (lambda (c)
+ (unless (typep c 'sql-value-conversion-error)
+ ;; this was blowing up the tests till I
+ ;; unbound *debugger-hook* not sure the answer,
+ ;; as this is also imensely useful in actually
+ ;; finding bugs below this point
+ (when *debugger-hook* (invoke-debugger c))
+ (error-converting-value val type database)))))
+ (call-next-method))))
+ ;; if we didnt get the right type after converting, we should probably
+ ;; error right away
+ (maybe-error-converting-value res val type database)))))
+
+(defmethod read-sql-value (val type database db-type)
+ "read a sql value, from :around read-eval is disabled read numbers in base 10"
+ ;; errors, nulls and preconverted types are already handled in around
+ (typecase type
+ (symbol
+ (case type
+ ((string varchar) val)
+ (char (string (schar val 0)))
+ ((or keyword symbol)
+ (read-from-string val))
+ ((smallint mediumint bigint integer universal-time)
+ (parse-integer val))
+ ((double-float float)
+ ;; ensure that whatever we got is coerced to a float of the correct
+ ;; type (eg: 1=>1.0d0)
+ (float
+ (etypecase val
+ (string (let ((*read-default-float-format*
+ (ecase type
+ (float 'single-float)
+ (double-float 'double-float))))
+ (read-from-string val)))
+ ;; maybe wrong type of float
+ (float val))
+ (if (eql type 'double-float) 1.0d0 1.0s0)))
+ (number (read-from-string val))
+ ((boolean generalized-boolean)
+ (if (member val '(nil t))
+ val
+ (etypecase val
+ (string
+ (when (member val '("1" "t" "true" "y") :test #'string-equal)
+ t))
+ (number (not (zerop val))))))
+ ((wall-time duration) (parse-timestring val))
+ (date (parse-datestring val))
+ (list (read-from-string val))
+ (t (error-converting-value val type database))))
+ (t (typecase val