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

quoting of AS clauses should not be splitted on "."

Browse source 
quoting of AS clauses should not be splitted on "."
This commit is contained in:
Starks 2015-07-22 17:06:56 +02:00
parent 110c31e2bc
commit 0a5eaedd9b
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/honeysql/format.clj
View file

@ -85,7 +85,9 @@
"regex" "regexp"}) "regex" "regexp"})
(defprotocol ToSql (defprotocol ToSql
(to-sql [x])) (to-sql
[x]
[x & args]))
(defmulti fn-handler (fn [op & args] op)) (defmulti fn-handler (fn [op & args] op))
@ -277,13 +279,14 @@
(extend-protocol ToSql (extend-protocol ToSql
clojure.lang.Keyword clojure.lang.Keyword
(to-sql [x] (to-sql [x & {:as args}]
(let [s (name x)] (let [s (name x)]
(case (.charAt s 0) (case (.charAt s 0)
\% (let [call-args (string/split (subs s 1) #"\." 2)] \% (let [call-args (string/split (subs s 1) #"\." 2)]
(to-sql (apply call (map keyword call-args)))) (to-sql (apply call (map keyword call-args))))
\? (to-sql (param (keyword (subs s 1)))) \? (to-sql (param (keyword (subs s 1))))
(quote-identifier x)))) (->> (apply concat (select-keys args [:split]))
(apply quote-identifier x)))))
clojure.lang.Symbol clojure.lang.Symbol
(to-sql [x] (quote-identifier x)) (to-sql [x] (quote-identifier x))
java.lang.Number java.lang.Number
@ -302,9 +305,13 @@
(if (= :select *clause*) (if (= :select *clause*)
" AS " " AS "
" ") " ")
(if (string? (second x)) (cond (string? (second x))
(quote-identifier (second x) :split false) (quote-identifier (second x) :split false)
(to-sql (second x)))))) (keyword? (second x))
(to-sql (second x) :split false)
:else
(to-sql (second x))
))))
SqlCall SqlCall
(to-sql [x] (to-sql [x]
(binding [*fn-context?* true] (binding [*fn-context?* true]