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

Yet another where helper fix

Browse source 
Support nil conditions
This commit is contained in:
Sean Corfield 2020-10-12 18:37:28 -07:00
parent 96260901c2
commit febcf385ee
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/honey/sql/helpers.cljc
View file

@ -10,14 +10,19 @@
(defn- and-merge (defn- and-merge
[current args] [current args]
(cond (= :and (first current)) (let [args (remove nil? args)]
(default-merge current args) (cond (= :and (first current))
(seq current) (default-merge current args)
(default-merge [:and current] args) (seq current)
(= 1 (count args)) (if (seq args)
(vec (first args)) (default-merge [:and current] args)
:else current)
(default-merge [:and] args))) (= 1 (count args))
(vec (first args))
(seq args)
(default-merge [:and] args)
:else
(vec current))))
(def ^:private special-merges (def ^:private special-merges
{:where #'and-merge {:where #'and-merge