Merge branch 'develop' of github.com:seancorfield/honeysql into develop

This commit is contained in:
Sean Corfield 2023-05-21 16:07:47 -07:00
commit f14e95ec9d

View file

@ -869,7 +869,8 @@
(defn on-conflict (defn on-conflict
"Accepts zero or more SQL entities (keywords or symbols), "Accepts zero or more SQL entities (keywords or symbols),
optionally followed by a single SQL clause (hash map)." optionally followed by a single SQL clause (`{:where <condition>}`).
Ex.: `(on-conflict :mom :dad {:where [:= :race \"human\"]}`"
{:arglists '([column* where-clause])} {:arglists '([column* where-clause])}
[& args] [& args]
(generic :on-conflict args)) (generic :on-conflict args))