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

Improve on conflict on constraint syntax

Browse source
This commit is contained in:
Sean Corfield 2021-02-15 17:56:47 -08:00
parent 155ae25ad0
commit 331597b22b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/honey/sql.cljc
View file

@ -503,6 +503,10 @@
" (" (format-entity (first x)) ") " " (" (format-entity (first x)) ") "
sql)] sql)]
params)) params))
(and (sequential? x) (= 1 (count x)))
(format-on-conflict k (first x))
(and (sequential? x) (= 0 (count x)))
[(sql-kw k)]
:else :else
(throw (ex-info "unsupported :on-conflict format" (throw (ex-info "unsupported :on-conflict format"
{:clause x})))) {:clause x}))))

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

@ -480,7 +480,7 @@
(defn on-conflict (defn on-conflict
[& args] [& args]
(generic-1 :on-conflict args)) (generic :on-conflict args))
(defn on-constraint (defn on-constraint
"Accepts a single constraint name." "Accepts a single constraint name."
@ -570,10 +570,12 @@
(do-update-set :x {:where [:<> :x nil]}))" (do-update-set :x {:where [:<> :x nil]}))"
([clause] (upsert {} clause)) ([clause] (upsert {} clause))
([data clause] ([data clause]
(let [{:keys [on-conflict do-nothing do-update-set where]} clause] (let [{:keys [on-conflict on-constraint do-nothing do-update-set where]} clause]
(cond-> data (cond-> data
on-conflict on-conflict
(assoc :on-conflict on-conflict) (assoc :on-conflict on-conflict)
on-constraint
(assoc :on-constraint on-constraint)
do-nothing do-nothing
(assoc :do-nothing do-nothing) (assoc :do-nothing do-nothing)
do-update-set do-update-set