r4786: Auto commit for Debian build

[umlisp.git] / sql-classes.lisp

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 088aec8fb9b07ce2c2567a6130115e0b515eb6b5..b341e458a9edccb5758cc77c1db022a508a38f9c 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.58 2003/05/04 00:30:36 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.60 2003/05/04 00:46:33 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -82,19 +82,19 @@
   "Query the UMLisp database. Return a list of umlisp objects whose name
 is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
   `(mutex-sql-query
-    (query-string-macro ,table ,fields ,srl ,where-name ,where-value 
+    (query-string ,table ,fields ,srl ,where-name ,where-value 
      :lrl ,lrl :single ,single :distinct ,distinct :order ,order :like ,like)))
 
-(defun umlisp-query-eval (table fields srl where-name where-value
+(defmacro umlisp-query-eval (table fields srl where-name where-value
                     &key (lrl "KCUILRL") single distinct order like)
   "Query the UMLisp database. Return a list of umlisp objects whose name
 is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
-  (mutex-sql-query
-   (query-string-macro ,table ,fields ,srl ,where-name ,where-value 
+  `(mutex-sql-query
+    (query-string-eval ,table ,fields ,srl ,where-name ,where-value 
      :lrl ,lrl :single ,single :distinct ,distinct :order ,order :like ,like)))
 
   
-(defmacro query-string-macro (table fields &optional srl where-name where-value
+(defmacro query-string (table fields &optional srl where-name where-value
                        &key (lrl "KCUILRL") single distinct order like)
   (let* ((%%fields (format nil "select ~A~{~:@(~A~)~^,~} from ~:@(~A~)"
                           (if distinct "distinct " "") fields table))
@@ -115,8 +115,8 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
       ,@(when %%order (list %%order))
       ,@(when single (list " limit 1")))))
 
-(defun query-string (table fields &optional srl where-name where-value
-                    &key (lrl "KCUILRL") single distinct order like)
+(defun query-string-eval (table fields &optional srl where-name where-value
+                         &key (lrl "KCUILRL") single distinct order like)
   (concatenate
    'string
    (format nil "select ~A~{~:@(~A~)~^,~} from ~:@(~A~)" 
@@ -204,7 +204,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
         (make-instance 'ucon :cui (ensure-integer cui)
                        :pfstr pfstr
                        :lrl (ensure-integer cuilrl)))
-     (query-string-macro mrcon (cui kpfstr kcuilrl) srl nil nil
+     (query-string mrcon (cui kpfstr kcuilrl) srl nil nil
                   :order (cui asc) :distinct t)
      :database db)))
 
@@ -218,7 +218,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
                  (make-instance 'ucon :cui (ensure-integer cui)
                                 :pfstr pfstr
                                 :lrl (ensure-integer cuilrl))))
-     (query-string-macro mrcon (cui kpfstr kcuilrl) srl nil nil :order (cui asc) :distinct t)
+     (query-string mrcon (cui kpfstr kcuilrl) srl nil nil :order (cui asc) :distinct t)
      :database db)))
 
 
@@ -362,7 +362,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
                          :stt stt
                          :lrl lrl
                          :str pfstr))
-       (query-string-macro mrcon (cui lui sui stt lrl kpfstr) srl nil nil :lrl lrl :distinct t
+       (query-string mrcon (cui lui sui stt lrl kpfstr) srl nil nil :lrl lrl :distinct t
                     :order (sui asc))
        :database db)))