From 814ef0649edf23f0136d5cad2d7738ae72e79871 Mon Sep 17 00:00:00 2001 From: Russ Tyndall Date: Mon, 5 Oct 2009 11:12:20 -0400 Subject: [PATCH] changed how where clauses are output to ensure that we do not output a "where" sql keyword when we will not output a clause. (Some expressions might produce an empty string in some cases (an and without any children comes to mind)). --- sql/expressions.lisp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sql/expressions.lisp b/sql/expressions.lisp index d7a95ef..5967f24 100644 --- a/sql/expressions.lisp +++ b/sql/expressions.lisp @@ -625,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) -- 2.34.1