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

Merge pull request #38 from MichaelBlume/extend-to-object

Browse source 
extend ToSql to cover Object
This commit is contained in:
Michael Blume 2015-03-03 13:42:50 -08:00
commit a96b14267e
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/honeysql/format.clj
View file

@ -258,15 +258,9 @@
(paren-wrap sql-str) (paren-wrap sql-str)
sql-str))) sql-str)))
nil nil
(-to-sql [x] "NULL")) (-to-sql [x] "NULL")
Object
(defn sqlable? [x] (-to-sql [x] (let [[x pname] (if (instance? SqlParam x)
(satisfies? ToSql x))
(defn to-sql [x]
(if (satisfies? ToSql x)
(-to-sql x)
(let [[x pname] (if (instance? SqlParam x)
(let [pname (param-name x)] (let [pname (param-name x)]
(if (map? @*input-params*) (if (map? @*input-params*)
[(get @*input-params* pname) pname] [(get @*input-params* pname) pname]
@ -279,6 +273,12 @@
(swap! *params* conj x) (swap! *params* conj x)
"?"))) "?")))
(defn sqlable? [x]
(satisfies? ToSql x))
(defn to-sql [x]
(-to-sql x))
;;;; ;;;;
(defn format-predicate* [pred] (defn format-predicate* [pred]