changed how where clauses are output to ensure that we do not output a "where"

[clsql.git] / sql / expressions.lisp

diff --git a/sql/expressions.lisp b/sql/expressions.lisp
index aa9edcab98143431b00e3213906ea1fd01bbb605..5967f24e941c707d14a175fb7de02db7365506df 100644 (file)
--- a/sql/expressions.lisp
+++ b/sql/expressions.lisp
@@ -243,18 +243,20 @@
 
 (defmethod output-sql ((expr sql-relational-exp) database)
   (with-slots (operator sub-expressions)
-    expr
-    (let ((subs (if (consp (car sub-expressions))
-                    (car sub-expressions)
-                    sub-expressions)))
-      (write-char #\( *sql-stream*)
-      (do ((sub subs (cdr sub)))
-          ((null (cdr sub)) (output-sql (car sub) database))
-        (output-sql (car sub) database)
-        (write-char #\Space *sql-stream*)
-        (output-sql operator database)
-        (write-char #\Space *sql-stream*))
-      (write-char #\) *sql-stream*)))
+      expr
+    (when sub-expressions
+      (let ((subs (if (consp (car sub-expressions))
+                     (car sub-expressions)
+                     sub-expressions)))
+       (write-char #\( *sql-stream*)
+       (do ((sub subs (cdr sub)))
+           ((null (cdr sub))
+              (output-sql (car sub) database))
+         (output-sql (car sub) database)
+         (write-char #\Space *sql-stream*)
+         (output-sql operator database)
+         (write-char #\Space *sql-stream*))
+       (write-char #\) *sql-stream*))))
   t)
 
 (defclass sql-array-exp (sql-relational-exp)
@@ -623,9 +625,13 @@ uninclusive, and the args from that keyword to the end."
       (write-string " ON " *sql-stream*)
       (output-sql on database))
     (when where
-      (write-string " WHERE " *sql-stream*)
-      (let ((*in-subselect* t))
-        (output-sql where database)))
+      (let ((where-out (string-trim '(#\newline #\space #\tab #\return)
+                                   (with-output-to-string (*sql-stream*)
+                                     (let ((*in-subselect* t))
+                                       (output-sql where database))))))
+       (when (> (length where-out) 0)
+         (write-string " WHERE " *sql-stream*)
+         (write-string where-out *sql-stream*))))
     (when group-by
       (write-string " GROUP BY " *sql-stream*)
       (if (listp group-by)