r4774: Auto commit for Debian build

[umlisp.git] / sql-classes.lisp

diff --git a/sql-classes.lisp b/sql-classes.lisp
index e567a46d7442e7a992282c56e615bf90281f4fd6..37ed4d1e1313e132540f5d868c0cb9a799a7972f 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql-classes.lisp,v 1.46 2003/05/03 20:56:57 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.48 2003/05/03 21:27:59 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -60,7 +60,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
   (let* ((%%fields (format nil "select ~A~{~:@(~A~)~^,~} from ~:@(~A~)"
                           (if distinct "distinct " "") fields table))
         (%%order (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) ""))
-        (%%lrl (format nil " and ~:@(~A~) <= ~~D" lrlname))
+        (%%lrl (format nil " and ~:@(~A~)<=" lrlname))
         (%%where (format nil " where ~:@(~A~)~A" where-name
                          (if like " like " "="))))
     `(concatenate
@@ -68,11 +68,11 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
       ,%%fields
       ,@(when %%where (list %%where))
       (if (quote ,where-name)
-         (if (stringp ,where-value)
-             (format nil ,(if like "'%~A%'" "'~A'") ,where-value)
-             (write-to-string ,where-value))
+         (if (numberp ,where-value)
+             (write-to-string ,where-value)
+             (format nil ,(if like "'%~A%'" "'~A'") ,where-value))
          "")
-      (if ,srl (format nil ,%%lrl ,srl) "")
+      (if ,srl (concatenate 'string ,%%lrl (write-to-string ,srl)) "")
       ,@(when %%order (list %%order))
       ,@(when single (list " limit 1")))))