- (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
- :order ,order :like ,like)))
- (if ,single
- (let ((tuple (car ,query)))
+ (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))))