r9528: move special variable declaration

[clsql.git] / sql / expressions.lisp

diff --git a/sql/expressions.lisp b/sql/expressions.lisp
index a64f9bf68b3cbcc6e0d75ec0ee11a45c8de30053..cc2e53b20fcab7f189b85ebd14fdd9a937607a99 100644 (file)
--- a/sql/expressions.lisp
+++ b/sql/expressions.lisp
@@ -1,7 +1,7 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;;
-;;;; $Id: $
+;;;; $Id$
 ;;;;
 ;;;; Classes defining SQL expressions and methods for formatting the
 ;;;; appropriate SQL commands.
@@ -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)