- (let ((query (gensym)))
- `(unless (and ,where-name (not ,where-value))
- (let ((,query (umlisp-query ,table ,fields ,srl ,where-name ,where-value
- :lrlname ,lrlname :single ,single :distinct ,distinct
- :terminal ,terminal :like ,like)))
- (if ,single
- (let ((tuple (car ,query)))
- (when tuple
- ,@body))
- (loop
- for tuple in ,query
- collect
- ,@body))))))
-
-(defun umlisp-query (table fields srl where-name where-value
- &key (lrlname "KCUILRL") single distinct terminal like)
+ (let ((value (gensym)))
+ (if single
+ `(let ((,value ,where-value))
+ (when ,value
+ (let ((tuple (car (umlisp-query ,table ,fields ,srl ,where-name ,value
+ :lrl ,lrl :single ,single
+ :distinct ,distinct :order ,order
+ :like ,like))))
+ (when tuple
+ (destructuring-bind ,fields tuple
+ ,@body)))))
+ `(let ((,value ,where-value))
+ (when ,value
+ (loop for tuple in
+ (umlisp-query ,table ,fields ,srl ,where-name ,value
+ :lrl ,lrl :single ,single :distinct ,distinct
+ :order ,order :like ,like)
+ collect (destructuring-bind ,fields tuple
+ ,@body)))))))
+
+(defmacro umlisp-query (table fields srl where-name where-value
+ &key (lrl "KCUILRL") single distinct order like)