Skip to content

Fix query-values priority #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2019
Merged

Fix query-values priority #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/honeysql_postgres/format.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
:offset 210
:lock 215
:values 220
:query-values 250}
:query-values 221}
custom-additions))

(defn override-default-clause-priority
Expand Down
11 changes: 9 additions & 2 deletions test/honeysql_postgres/postgres_test.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
add-column partition-by insert-into-as
create-table rename-table drop-table
window create-view over with-columns]]
[honeysql.helpers :as sqlh :refer [insert-into values where select
from order-by update sset]]
[honeysql.helpers :as sqlh :refer [insert-into values where select columns
from order-by update sset query-values]]
[honeysql.core :as sql]
[clojure.test :as test :refer [deftest is testing]]))

Expand Down Expand Up @@ -45,6 +45,13 @@
(values [{:did 23 :dname "Foo Distributors"}])
(on-conflict :did)
(do-update-set! [:dname "EXCLUDED.dname || ' (formerly ' || d.dname || ')'"])
sql/format)))
(is (= ["INSERT INTO distributors (did, dname) (SELECT ?, ?) ON CONFLICT ON CONSTRAINT distributors_pkey DO NOTHING" 1 "whatever"]
(-> (insert-into :distributors)
(columns :did :dname)
(query-values (select 1 "whatever"))
(upsert (-> (on-conflict-constraint :distributors_pkey)
do-nothing))
sql/format)))))


Expand Down