From 228eb9fb67cf090eb55d2d57a2dcfe03391f6cea Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Sat, 12 Jun 2021 18:47:10 -0700 Subject: [PATCH] Fix #327 by improving error message --- src/honey/sql.cljc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/honey/sql.cljc b/src/honey/sql.cljc index 3684085..5ff4375 100644 --- a/src/honey/sql.cljc +++ b/src/honey/sql.cljc @@ -888,10 +888,10 @@ [statement-map & [{:keys [aliased nested pretty]}]] (let [[sqls params leftover] (reduce (fn [[sql params leftover] k] - (if-some [xs (if-some [xs (k statement-map)] + (if-some [xs (if-some [xs (k leftover)] xs (let [s (kw->sym k)] - (get statement-map s)))] + (get leftover s)))] (let [formatter (k @clause-format) [sql' & params'] (formatter k xs)] [(conj sql sql') @@ -901,7 +901,7 @@ [[] [] statement-map] *clause-order*)] (if (seq leftover) - (throw (ex-info (str "Unknown SQL clauses: " + (throw (ex-info (str "These SQL clauses are unknown or have nil values: " (str/join ", " (keys leftover))) leftover)) (into [(cond-> (str/join (if pretty "\n" " ") (filter seq sqls))