;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: sql-classes.lisp,v 1.44 2003/05/03 20:42:50 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.46 2003/05/03 20:56:57 kevin Exp $
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
(if distinct "distinct " "") fields table))
(%%order (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) ""))
(%%lrl (format nil " and ~:@(~A~) <= ~~D" lrlname))
- (%%where (format nil " where ~:@(~A~)" where-name)))
+ (%%where (format nil " where ~:@(~A~)~A" where-name
+ (if like " like " "="))))
`(concatenate
'string
,%%fields
,@(when %%where (list %%where))
(if (quote ,where-name)
- (format nil (if (stringp ,where-value)
- (if ,like " like '%~A%'" "='~A'")
- "=~A")
- ,where-value)
+ (if (stringp ,where-value)
+ (format nil ,(if like "'%~A%'" "'~A'") ,where-value)
+ (write-to-string ,where-value))
"")
(if ,srl (format nil ,%%lrl ,srl) "")
,@(when %%order (list %%order))