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

Fix #242 by turning modifiers into a multimethod

Browse source
This commit is contained in:
Sean Corfield 2019-04-06 20:30:16 -07:00
parent 05cc39a41c
commit 509df19702
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/honeysql/format.cljc
View file

@ -502,12 +502,17 @@
(defmethod format-clause :exists [[_ table-expr] _] (defmethod format-clause :exists [[_ table-expr] _]
(str "EXISTS " (to-sql table-expr))) (str "EXISTS " (to-sql table-expr)))
(defmulti format-modifiers (fn [[op & _]] op))
(defmethod format-modifiers :distinct [_] "DISTINCT")
(defmethod format-modifiers :default [coll]
(space-join (map (comp upper-case name) coll)))
(defmethod format-clause :select [[_ fields] sql-map] (defmethod format-clause :select [[_ fields] sql-map]
(str "SELECT " (str "SELECT "
(when (:modifiers sql-map) (when (:modifiers sql-map)
(str (space-join (map (comp upper-case name) (str (format-modifiers (:modifiers sql-map)) " "))
(:modifiers sql-map)))
" "))
(comma-join (map to-sql fields)))) (comma-join (map to-sql fields))))
(defmethod format-clause :from [[_ tables] _] (defmethod format-clause :from [[_ tables] _]