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

Merge pull request #142 from rnewman/rnewman/union-paren

Browse source 
Don't parenthesize the subclauses of a UNION, UNION ALL, or INTERSECT clause.
This commit is contained in:
Michael Blume 2016-11-06 00:57:49 -07:00 committed by GitHub
commit 160e2821b8
2 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/honeysql/format.cljc
View file

@ -560,13 +560,16 @@
(str "WITH RECURSIVE " (comma-join (map cte->sql ctes)))) (str "WITH RECURSIVE " (comma-join (map cte->sql ctes))))
(defmethod format-clause :union [[_ maps] _] (defmethod format-clause :union [[_ maps] _]
(string/join " UNION " (map to-sql maps))) (binding [*subquery?* false]
(string/join " UNION " (map to-sql maps))))
(defmethod format-clause :union-all [[_ maps] _] (defmethod format-clause :union-all [[_ maps] _]
(string/join " UNION ALL " (map to-sql maps))) (binding [*subquery?* false]
(string/join " UNION ALL " (map to-sql maps))))
(defmethod format-clause :intersect [[_ maps] _] (defmethod format-clause :intersect [[_ maps] _]
(string/join " INTERSECT " (map to-sql maps))) (binding [*subquery?* false]
(string/join " INTERSECT " (map to-sql maps))))
(defmethod fn-handler "case" [_ & clauses] (defmethod fn-handler "case" [_ & clauses]
(str "CASE " (str "CASE "

26
test/honeysql/format_test.cljc
View file

@ -77,16 +77,36 @@
["INSERT INTO foo (baz) VALUES (ARRAY[?, ?, ?])" "one" "two" "three"]))) ["INSERT INTO foo (baz) VALUES (ARRAY[?, ?, ?])" "one" "two" "three"])))
(deftest union-test (deftest union-test
;; UNION and INTERSECT subexpressions should not be parenthesized.
;; If you need to add more complex expressions, use a subquery like this:
;; SELECT foo FROM bar1
;; UNION
;; SELECT foo FROM (SELECT foo FROM bar2 ORDER BY baz LIMIT 2)
;; ORDER BY foo ASC
(is (= (format {:union [{:select [:foo] :from [:bar1]} (is (= (format {:union [{:select [:foo] :from [:bar1]}
{:select [:foo] :from [:bar2]}]}) {:select [:foo] :from [:bar2]}]})
["(SELECT foo FROM bar1) UNION (SELECT foo FROM bar2)"]))) ["SELECT foo FROM bar1 UNION SELECT foo FROM bar2"])))
(deftest union-all-test (deftest union-all-test
(is (= (format {:union-all [{:select [:foo] :from [:bar1]} (is (= (format {:union-all [{:select [:foo] :from [:bar1]}
{:select [:foo] :from [:bar2]}]}) {:select [:foo] :from [:bar2]}]})
["(SELECT foo FROM bar1) UNION ALL (SELECT foo FROM bar2)"]))) ["SELECT foo FROM bar1 UNION ALL SELECT foo FROM bar2"])))
(deftest intersect-test (deftest intersect-test
(is (= (format {:intersect [{:select [:foo] :from [:bar1]} (is (= (format {:intersect [{:select [:foo] :from [:bar1]}
{:select [:foo] :from [:bar2]}]}) {:select [:foo] :from [:bar2]}]})
["(SELECT foo FROM bar1) INTERSECT (SELECT foo FROM bar2)"]))) ["SELECT foo FROM bar1 INTERSECT SELECT foo FROM bar2"])))
(deftest inner-parts-test
(testing "The correct way to apply ORDER BY to various parts of a UNION"
(is (= (format
{:union
[{:select [:amount :id :created_on]
:from [:transactions]}
{:select [:amount :id :created_on]
:from [{:select [:amount :id :created_on]
:from [:other_transactions]
:order-by [[:amount :desc]]
:limit 5}]}]
:order-by [[:amount :asc]]})
["SELECT amount, id, created_on FROM transactions UNION SELECT amount, id, created_on FROM (SELECT amount, id, created_on FROM other_transactions ORDER BY amount DESC LIMIT ?) ORDER BY amount ASC" 5]))))