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

Merge pull request #196 from emidln/emidln/insert-into-drop-parens

Browse source 
Avoid wrapping QUERY with parens while formatting INSERT INTO ... QUERY
This commit is contained in:
Michael Blume 2018-02-10 23:48:01 -08:00 committed by GitHub
commit 8ad38d28af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/honeysql/format.cljc
View file

@ -540,7 +540,8 @@
(str "INSERT INTO " (str "INSERT INTO "
(to-sql (ffirst table)) (to-sql (ffirst table))
" (" (comma-join (map to-sql (second (first table)))) ") " " (" (comma-join (map to-sql (second (first table)))) ") "
(to-sql (second table))) (binding [*subquery?* false]
(to-sql (second table))))
(str "INSERT INTO " (to-sql table)))) (str "INSERT INTO " (to-sql table))))
(defmethod format-clause :columns [[_ fields] _] (defmethod format-clause :columns [[_ fields] _]

4
test/honeysql/format_test.cljc
View file

@ -58,7 +58,9 @@
(is (= (format-clause (first {:insert-into [:foo {:select [:bar] :from [:baz]}]}) nil) (is (= (format-clause (first {:insert-into [:foo {:select [:bar] :from [:baz]}]}) nil)
"INSERT INTO foo SELECT bar FROM baz")) "INSERT INTO foo SELECT bar FROM baz"))
(is (= (format-clause (first {:insert-into [[:foo [:a :b :c]] {:select [:d :e :f] :from [:baz]}]}) nil) (is (= (format-clause (first {:insert-into [[:foo [:a :b :c]] {:select [:d :e :f] :from [:baz]}]}) nil)
"INSERT INTO foo (a, b, c) SELECT d, e, f FROM baz"))) "INSERT INTO foo (a, b, c) SELECT d, e, f FROM baz"))
(is (= (format {:insert-into [[:foo [:a :b :c]] {:select [:d :e :f] :from [:baz]}]})
["INSERT INTO foo (a, b, c) SELECT d, e, f FROM baz"])))
(deftest exists-test (deftest exists-test
(is (= (format {:exists {:select [:a] :from [:foo]}}) (is (= (format {:exists {:select [:a] :from [:foo]}})