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

fixes #340

Browse source
This commit is contained in:
Sean Corfield 2021-07-22 19:49:25 -07:00
parent 3288ee7ec5
commit 10e6e755e9
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
# Changes # Changes
* 2.0.next in progress * 2.0.next in progress
* Fixes #340 by making hyphen to space logic more general so _operators_ containing `-` should retain the hyphen without special cases.
* Documentation improvements: `:fetch`, `:lift`, `:limit`, `:offset`, `:param`, `:select`; also around JSON/PostgreSQL. * Documentation improvements: `:fetch`, `:lift`, `:limit`, `:offset`, `:param`, `:select`; also around JSON/PostgreSQL.
* 2.0.0-rc5 (for testing; 2021-07-17) * 2.0.0-rc5 (for testing; 2021-07-17)

15
src/honey/sql.cljc
View file

@ -146,9 +146,15 @@
#?(:clj (fn [^String s] (.. s toString (toUpperCase (java.util.Locale/US)))) #?(:clj (fn [^String s] (.. s toString (toUpperCase (java.util.Locale/US))))
:cljs str/upper-case)) :cljs str/upper-case))
(def ^:private keep-hyphen (defn- dehyphen
"The set of symbols that should not have `-` replaced by space." "The loop/recur is because we might need to account for x-y-z in
#{"-" "<->"}) a string where the second - won't get replaced because the regex
already matched y. I'm sure there's a more efficent solution!"
[s]
(loop [s s prev nil]
(if (= s prev)
s
(recur (str/replace s #"(\w)-(\w)" "$1 $2") s))))
(defn sql-kw (defn sql-kw
"Given a keyword, return a SQL representation of it as a string. "Given a keyword, return a SQL representation of it as a string.
@ -158,8 +164,7 @@
Any namespace qualifier is ignored." Any namespace qualifier is ignored."
[k] [k]
(-> k (name) (upper-case) (-> k (name) (dehyphen) (upper-case)))
(as-> s (if (keep-hyphen s) s (str/replace s "-" " ")))))
(defn- sym->kw (defn- sym->kw
"Given a symbol, produce a keyword, retaining the namespace "Given a symbol, produce a keyword, retaining the namespace