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

Fix #240 by extending keyword call syntax

Browse source 
Also updates dev/test dependencies.
This commit is contained in:
Sean Corfield 2019-03-27 10:51:26 -07:00
parent 29aa1670e5
commit d10166c0ed
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,6 +10,7 @@ pom.xml*
*.jar *.jar
*.class *.class
.cpcache .cpcache
.eastwood
.lein-deps-sum .lein-deps-sum
.lein-failures .lein-failures
.lein-plugins .lein-plugins

1
CHANGES.md
View file

@ -1,5 +1,6 @@
## 0.9.5 in progress ## 0.9.5 in progress
* `:%call.arg` syntax extended to support more than one argument: `%call.first.second` Fix #240.
* `format-predicate` now accepts `parameterizer` as a named argument (default `:jdbc`) to match `format`. PR #234. (@glittershark) * `format-predicate` now accepts `parameterizer` as a named argument (default `:jdbc`) to match `format`. PR #234. (@glittershark)
## 0.9.4 ## 0.9.4

11
project.clj
View file

@ -9,7 +9,7 @@
[net.cgrand/macrovich "0.2.1"]] [net.cgrand/macrovich "0.2.1"]]
:aliases {"test-readme" ["with-profile" "midje" "midje"] :aliases {"test-readme" ["with-profile" "midje" "midje"]
"test-all" ["with-profile" "test-all" ["with-profile"
"default:1.7,default:1.8,default:1.9,default:master" "default:1.7,default:1.8,default:1.9,default:1.10,default:master"
"test"]} "test"]}
:cljsbuild {:builds {:release {:source-paths ["src"] :cljsbuild {:builds {:release {:source-paths ["src"]
:compiler {:output-to "dist/honeysql.js" :compiler {:output-to "dist/honeysql.js"
@ -35,13 +35,14 @@
[honeysql.format :as fmt] [honeysql.format :as fmt]
[honeysql.helpers :refer [defhelper]]"}} [honeysql.helpers :refer [defhelper]]"}}
:master {:repositories [["snapshots" "https://oss.sonatype.org/content/repositories/snapshots/"]] :master {:repositories [["snapshots" "https://oss.sonatype.org/content/repositories/snapshots/"]]
:dependencies [[org.clojure/clojure "1.10.0-master-SNAPSHOT"]]} :dependencies [[org.clojure/clojure "1.11.0-master-SNAPSHOT"]]}
:1.10 {:dependencies [[org.clojure/clojure "1.10.0"]]}
:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]} :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
:1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]} :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]} :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
:dev {:dependencies [[org.clojure/clojurescript "1.9.521"] :dev {:dependencies [[org.clojure/clojurescript "1.10.520"]
[cljsbuild "1.1.7"]] [cljsbuild "1.1.7"]]
:plugins [[lein-cljsbuild "1.1.7"] :plugins [[lein-cljsbuild "1.1.7"]
[jonase/eastwood "0.2.6"] [jonase/eastwood "0.3.5"]
[lein-doo "0.1.10"] [lein-doo "0.1.11"]
[lein-tach "1.0.0"]]}}) [lein-tach "1.0.0"]]}})

2
src/honeysql/format.cljc
View file

@ -388,7 +388,7 @@
(to-sql [x] (to-sql [x]
(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) #"\.")]
(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)))) (quote-identifier x))))