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

fix joins

Browse source
This commit is contained in:
Justin Kramer 2012-07-13 11:46:30 -04:00
parent b9f1e17c91
commit 265fa6c81f
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/honeysql/core.clj
View file

@ -48,17 +48,11 @@
(defn join [& clauses] (defn join [& clauses]
(let [[m clauses] (if (map? (first clauses)) (let [[m clauses] (if (map? (first clauses))
[(first clauses) (rest clauses)] [(first clauses) (rest clauses)]
[{} clauses]) [{} clauses])]
clauses (if (not (coll? (first clauses)))
[clauses]
clauses)]
(assoc m :join clauses))) (assoc m :join clauses)))
(defn merge-join [sql-map & clauses] (defn merge-join [sql-map & clauses]
(let [clauses (if (not (coll? (first clauses))) (update-in sql-map [:join] concat clauses))
[clauses]
clauses)]
(update-in sql-map [:join] concat clauses)))
(defn group-by [& fields] (defn group-by [& fields]
(let [[m fields] (if (map? (first fields)) (let [[m fields] (if (map? (first fields))