luciano/honeysql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #327 by improving error message

Browse source
This commit is contained in:
Sean Corfield 2021-06-12 18:47:10 -07:00
parent a51cfe5a2e
commit 228eb9fb67
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/honey/sql.cljc
View file

@ -888,10 +888,10 @@
[statement-map & [{:keys [aliased nested pretty]}]] [statement-map & [{:keys [aliased nested pretty]}]]
(let [[sqls params leftover] (let [[sqls params leftover]
(reduce (fn [[sql params leftover] k] (reduce (fn [[sql params leftover] k]
(if-some [xs (if-some [xs (k statement-map)] (if-some [xs (if-some [xs (k leftover)]
xs xs
(let [s (kw->sym k)] (let [s (kw->sym k)]
(get statement-map s)))] (get leftover s)))]
(let [formatter (k @clause-format) (let [formatter (k @clause-format)
[sql' & params'] (formatter k xs)] [sql' & params'] (formatter k xs)]
[(conj sql sql') [(conj sql sql')
@ -901,7 +901,7 @@
[[] [] statement-map] [[] [] statement-map]
*clause-order*)] *clause-order*)]
(if (seq leftover) (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))) (str/join ", " (keys leftover)))
leftover)) leftover))
(into [(cond-> (str/join (if pretty "\n" " ") (filter seq sqls)) (into [(cond-> (str/join (if pretty "\n" " ") (filter seq sqls))