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

move format-predicate down

Browse source
This commit is contained in:
Mike Blume 2015-06-14 13:16:02 -07:00
parent 38e3812e66
commit fae5545e8a
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/honeysql/format.clj
View file

@ -84,8 +84,6 @@
"not-like" "not like" "not-like" "not like"
"regex" "regexp"}) "regex" "regexp"})
(declare format-predicate*)
(defprotocol ToSql (defprotocol ToSql
(to-sql [x])) (to-sql [x]))
@ -238,19 +236,6 @@
(into [sql-str] @*params*)) (into [sql-str] @*params*))
[sql-str]))))) [sql-str])))))
(defn format-predicate
"Formats a predicate (e.g., for WHERE, JOIN, or HAVING) as a string."
[pred & {:keys [quoting]}]
(binding [*params* (atom [])
*param-counter* (atom 0)
*param-names* (atom [])
*quote-identifier-fn* (or (quote-fns quoting)
*quote-identifier-fn*)]
(let [sql-str (format-predicate* pred)]
(if (seq @*params*)
(into [sql-str] @*params*)
[sql-str]))))
(defprotocol Parameterizable (defprotocol Parameterizable
(to-params [value pname])) (to-params [value pname]))
@ -382,6 +367,19 @@
(to-sql (apply call pred)))))) (to-sql (apply call pred))))))
(defn format-predicate
"Formats a predicate (e.g., for WHERE, JOIN, or HAVING) as a string."
[pred & {:keys [quoting]}]
(binding [*params* (atom [])
*param-counter* (atom 0)
*param-names* (atom [])
*quote-identifier-fn* (or (quote-fns quoting)
*quote-identifier-fn*)]
(let [sql-str (format-predicate* pred)]
(if (seq @*params*)
(into [sql-str] @*params*)
[sql-str]))))
(defmulti format-clause (defmulti format-clause
"Takes a map entry representing a clause and returns an SQL string" "Takes a map entry representing a clause and returns an SQL string"
(fn [clause _] (key clause))) (fn [clause _] (key clause)))