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

Fix using maps with different key orders in :values

Browse source
This commit is contained in:
Tom Connors 2017-03-22 15:38:15 -04:00 committed by Michael Blume
parent 7b61250b2d
commit bdfee0883e
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/honeysql/format.cljc
View file

@ -541,10 +541,11 @@
(if (sequential? (first values))
(str "VALUES " (comma-join (for [x values]
(str "(" (comma-join (map to-sql x)) ")"))))
(let [cols (keys (first values))]
(str
"(" (comma-join (map to-sql (keys (first values)))) ") VALUES "
"(" (comma-join (map to-sql cols)) ") VALUES "
(comma-join (for [x values]
(str "(" (comma-join (map to-sql (vals x))) ")"))))))
(str "(" (comma-join (map #(to-sql (get x %)) cols)) ")")))))))
(defmethod format-clause :query-values [[_ query-values] _]
(to-sql query-values))

6
test/honeysql/core_test.cljc
View file

@ -84,6 +84,12 @@
(insert-into :foo)
(columns :bar)
(values [[(honeysql.format/value {:baz "my-val"})]])
sql/format)))
(is (= ["INSERT INTO foo (a, b, c) VALUES (?, ?, ?), (?, ?, ?)"
"a" "b" "c" "a" "b" "c"]
(-> (insert-into :foo)
(values [(array-map :a "a" :b "b" :c "c")
(hash-map :a "a" :b "b" :c "c")])
sql/format))))
(deftest test-operators