projects
/
umlisp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bca2b13
)
r4772: Auto commit for Debian build
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sat, 3 May 2003 20:56:57 +0000
(20:56 +0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sat, 3 May 2003 20:56:57 +0000
(20:56 +0000)
sql-classes.lisp
patch
|
blob
|
history
diff --git
a/sql-classes.lisp
b/sql-classes.lisp
index 4665dedde1ef06319a78b008d0bc61b3eb2e3ded..e567a46d7442e7a992282c56e615bf90281f4fd6 100644
(file)
--- a/
sql-classes.lisp
+++ b/
sql-classes.lisp
@@
-7,7
+7,7
@@
;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: sql-classes.lisp,v 1.4
5 2003/05/03 20:47:28
kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.4
6 2003/05/03 20:56:57
kevin Exp $
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@
-61,16
+61,16
@@
is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
(if distinct "distinct " "") fields table))
(%%order (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) ""))
(%%lrl (format nil " and ~:@(~A~) <= ~~D" lrlname))
(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)
`(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))
"")
(if ,srl (format nil ,%%lrl ,srl) "")
,@(when %%order (list %%order))