From 8784a104fb8734f0f0db745fcc2d45f17977a674 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Fri, 6 Mar 2020 09:42:51 -0800 Subject: [PATCH] Fixes #253 properly; logs #254 and #255 in CHANGES --- CHANGES.md | 5 +++++ src/honeysql/format.cljc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index e2baf49..512572c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## 0.9.10 -- unreleased + +* Fix #254 #255 by adding support for `except`. (@ted-coakley-otm) +* Fix #253 properly by supporting `false` as well. (@ted-coakley-otm) + ## 0.9.9 * Fix #253 by supporting non-sequential join expressions. diff --git a/src/honeysql/format.cljc b/src/honeysql/format.cljc index b1339f8..35d13dc 100644 --- a/src/honeysql/format.cljc +++ b/src/honeysql/format.cljc @@ -545,7 +545,7 @@ (str (when type (str (upper-case (name type)) " ")) "JOIN " (to-sql table) - (when pred + (when (some? pred) (if (and (sequential? pred) (= :using (first pred))) (str " USING (" (->> pred rest (map quote-identifier) comma-join) ")") (str " ON " (format-predicate* pred))))))