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

Merge pull request #201 from vincent-dm/master

Browse source 
adds support for JOIN ... USING (...) syntax (#188)
This commit is contained in:
Michael Blume 2018-04-12 23:39:59 -07:00 committed by GitHub
commit 43e94bf497
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/honeysql/format.cljc
View file

@ -489,10 +489,13 @@
(str "WHERE " (format-predicate* pred))) (str "WHERE " (format-predicate* pred)))
(defn format-join [type table pred] (defn format-join [type table pred]
(cond-> (str (when type (str (when type
(str (string/upper-case (name type)) " ")) (str (string/upper-case (name type)) " "))
"JOIN " (to-sql table)) "JOIN " (to-sql table)
pred (str " ON " (format-predicate* pred)))) (when pred
(if (= :using (first pred))
(str " USING (" (->> pred rest (map quote-identifier) comma-join) ")")
(str " ON " (format-predicate* pred))))))
(defmethod format-clause :join [[_ join-groups] _] (defmethod format-clause :join [[_ join-groups] _]
(space-join (map #(apply format-join :inner %) (space-join (map #(apply format-join :inner %)

8
test/honeysql/core_test.cljc
View file

@ -192,6 +192,14 @@
(join :x [:= :foo.id :x.id] :y nil) (join :x [:= :foo.id :x.id] :y nil)
sql/format))))) sql/format)))))
(deftest join-using-test
(testing "nil join"
(is (= ["SELECT * FROM foo INNER JOIN x USING (id) INNER JOIN y USING (foo, bar)"]
(-> (select :*)
(from :foo)
(join :x [:using :id] :y [:using :foo :bar])
sql/format)))))
(deftest inline-test (deftest inline-test
(is (= ["SELECT * FROM foo WHERE id = 5"] (is (= ["SELECT * FROM foo WHERE id = 5"]
(-> (select :*) (-> (select :*)