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

Merge pull request #4 from djpowell/master

Browse source 
Preserve case of function calls
This commit is contained in:
Justin Kramer 2013-08-06 10:54:08 -07:00
commit c405bda740
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/honeysql/format.clj
View file

@ -54,11 +54,10 @@
")")) ")"))
(defmethod fn-handler :default [op & args] (defmethod fn-handler :default [op & args]
(let [op-upper (string/upper-case op) (let [args (map to-sql args)]
args (map to-sql args)]
(if (infix-fns op) (if (infix-fns op)
(paren-wrap (string/join (str " " op-upper " ") args)) (paren-wrap (string/join (str " " op " ") args))
(str op-upper (paren-wrap (comma-join args)))))) (str op (paren-wrap (comma-join args))))))
(defmethod fn-handler "count-distinct" [_ & args] (defmethod fn-handler "count-distinct" [_ & args]
(str "COUNT(DISTINCT " (comma-join (map to-sql args)) ")")) (str "COUNT(DISTINCT " (comma-join (map to-sql args)) ")"))
@ -283,4 +282,4 @@
(str "LIMIT " (to-sql limit))) (str "LIMIT " (to-sql limit)))
(defmethod format-clause :offset [[_ offset] _] (defmethod format-clause :offset [[_ offset] _]
(str "OFFSET " (to-sql offset))) (str "OFFSET " (to-sql offset)))