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

allow joins without a pred

Browse source
This commit is contained in:
Stuart Hinson 2016-03-01 09:39:21 -05:00
parent a25ce4db5d
commit 80e9d2ec44
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/honeysql/format.clj
View file

@ -414,10 +414,10 @@
(str "WHERE " (format-predicate* pred))) (str "WHERE " (format-predicate* pred)))
(defn format-join [type table pred] (defn format-join [type table pred]
(str (when type (cond-> (str (when type
(str (string/upper-case (name type)) " ")) (str (string/upper-case (name type)) " "))
"JOIN " (to-sql table) "JOIN " (to-sql table))
" ON " (format-predicate* pred))) pred (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.clj
View file

@ -165,3 +165,11 @@
(-> (select (sql/call :min "time")) (-> (select (sql/call :min "time"))
(from "table") (from "table")
sql/format)))) sql/format))))
(deftest join-test
(testing "nil join"
(is (= ["SELECT * FROM foo INNER JOIN x ON foo.id = x.id INNER JOIN y"]
(-> (select :*)
(from :foo)
(join :x [:= :foo.id :x.id] :y nil)
sql/format)))))