X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fexpressions.lisp;h=cc2e53b20fcab7f189b85ebd14fdd9a937607a99;hb=e520ca44fbd7999a3185f34e68f656b954707993;hp=80d735c1ee07eed15b4a6d13f20d35116382477f;hpb=225c02af1ae1c9c6f0b6c29eaf8319d48caae89f;p=clsql.git diff --git a/sql/expressions.lisp b/sql/expressions.lisp index 80d735c..cc2e53b 100644 --- a/sql/expressions.lisp +++ b/sql/expressions.lisp @@ -374,12 +374,14 @@ :test (lambda (tab1 tab2) (equal (slot-value tab1 'name) (slot-value tab2 'name)))))) +(defvar *in-subselect* nil) (defmethod output-sql ((expr sql-function-exp) database) (with-slots (name args) expr (output-sql name database) - (when args (output-sql args database))) + (let ((*in-subselect* nil)) ;; aboid double parens + (when args (output-sql args database)))) t) @@ -563,8 +565,6 @@ uninclusive, and the args from that keyword to the end." :group-by group-by :having having :order-by order-by :inner-join inner-join :on on)))))) -(defvar *in-subselect* nil) - (defmethod output-sql ((query sql-query) database) (with-slots (distinct selections from where group-by having order-by limit offset inner-join on all set-operation)