From d10166c0ed704c677df18b5c4fd50f0b6aa1d1e5 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Wed, 27 Mar 2019 10:51:26 -0700 Subject: [PATCH] Fix #240 by extending keyword call syntax Also updates dev/test dependencies. --- .gitignore | 1 + CHANGES.md | 1 + project.clj | 11 ++++++----- src/honeysql/format.cljc | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0e1ea6e..ef6ee9c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ pom.xml* *.jar *.class .cpcache +.eastwood .lein-deps-sum .lein-failures .lein-plugins diff --git a/CHANGES.md b/CHANGES.md index e96801c..300026e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,6 @@ ## 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) ## 0.9.4 diff --git a/project.clj b/project.clj index 961e402..04bd234 100644 --- a/project.clj +++ b/project.clj @@ -9,7 +9,7 @@ [net.cgrand/macrovich "0.2.1"]] :aliases {"test-readme" ["with-profile" "midje" "midje"] "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"]} :cljsbuild {:builds {:release {:source-paths ["src"] :compiler {:output-to "dist/honeysql.js" @@ -35,13 +35,14 @@ [honeysql.format :as fmt] [honeysql.helpers :refer [defhelper]]"}} :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.8 {:dependencies [[org.clojure/clojure "1.8.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"]] :plugins [[lein-cljsbuild "1.1.7"] - [jonase/eastwood "0.2.6"] - [lein-doo "0.1.10"] + [jonase/eastwood "0.3.5"] + [lein-doo "0.1.11"] [lein-tach "1.0.0"]]}}) diff --git a/src/honeysql/format.cljc b/src/honeysql/format.cljc index bb89012..449879a 100644 --- a/src/honeysql/format.cljc +++ b/src/honeysql/format.cljc @@ -388,7 +388,7 @@ (to-sql [x] (let [s (name x)] (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 (param (keyword (subs s 1)))) (quote-identifier x))))