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

on-conflict needs ( ) around exprs

Browse source
This commit is contained in:
Sean Corfield 2023-06-20 13:03:19 -07:00
parent 290537c581
commit e7972ac1b4
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/honey/sql.cljc
View file

@ -889,11 +889,10 @@
{:clause x}))) {:clause x})))
[sqls expr-params] [sqls expr-params]
(when (seq exprs) (when (seq exprs)
(format-expr-list exprs)) (format-expr-list (map (fn [e] (if (sequential? e) [:nest e] e)) exprs)))
[sql & clause-params] [sql & clause-params]
(when clause (when clause
(format-dsl clause))] (format-dsl clause))]
(-> [(str (sql-kw k) (-> [(str (sql-kw k)
(when (pos? n) (when (pos? n)
(str " (" (str/join ", " sqls) ")")) (str " (" (str/join ", " sqls) ")"))

6
test/honey/sql_test.cljc
View file

@ -772,13 +772,13 @@ DO NOTHING
INSERT INTO customers INSERT INTO customers
(name, email) (name, email)
VALUES ('Microsoft', 'hotline@microsoft.com') VALUES ('Microsoft', 'hotline@microsoft.com')
ON CONFLICT (name, TRIM(email)) ON CONFLICT ((foo + ?), name, (TRIM(email)))
DO NOTHING DO NOTHING
"] " 1]
(format {:insert-into :customers (format {:insert-into :customers
:columns [:name :email] :columns [:name :email]
:values [[[:inline "Microsoft"], [:inline "hotline@microsoft.com"]]] :values [[[:inline "Microsoft"], [:inline "hotline@microsoft.com"]]]
:on-conflict [:name [:trim :email]] :on-conflict [[:+ :foo 1] :name [:trim :email]]
:do-nothing true} :do-nothing true}
{:pretty true}))) {:pretty true})))
(is (= [" (is (= ["