diff --git a/CHANGELOG.md b/CHANGELOG.md index e5e07d9..24c7028 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changes -* 2.4.next in progress +* 2.4.1006 -- 2023-03-17 * Fix [#478](https://github.com/seancorfield/honeysql/issues/478) by handling `:do-update-set` correctly in the `upsert` helper and by handling parameters correctly in the `:do-update-set` formatter. * Fix [#476](https://github.com/seancorfield/honeysql/issues/476) by adding support for multiple arguments to `:raw`, essentially restoring 1.x functionality (while still allowing for embedded vectors as expressions, introduced in 2.x). diff --git a/README.md b/README.md index 83988a4..7ac9129 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ SQL as Clojure data structures. Build queries programmatically -- even at runtim ## Build -[![Clojars Project](https://clojars.org/com.github.seancorfield/honeysql/latest-version.svg)](https://clojars.org/com.github.seancorfield/honeysql) [![cljdoc badge](https://cljdoc.org/badge/com.github.seancorfield/honeysql?2.4.1002)](https://cljdoc.org/d/com.github.seancorfield/honeysql/CURRENT) +[![Clojars Project](https://clojars.org/com.github.seancorfield/honeysql/latest-version.svg)](https://clojars.org/com.github.seancorfield/honeysql) [![cljdoc badge](https://cljdoc.org/badge/com.github.seancorfield/honeysql?2.4.1006)](https://cljdoc.org/d/com.github.seancorfield/honeysql/CURRENT) This project follows the version scheme MAJOR.MINOR.COMMITS where MAJOR and MINOR provide some relative indication of the size of the change, but do not follow semantic versioning. In general, all changes endeavor to be non-breaking (by moving to new names rather than by breaking existing names). COMMITS is an ever-increasing counter of commits since the beginning of this repository. diff --git a/doc/differences-from-1-x.md b/doc/differences-from-1-x.md index a9e29df..d76da74 100644 --- a/doc/differences-from-1-x.md +++ b/doc/differences-from-1-x.md @@ -63,7 +63,7 @@ Supported Clojure versions: 1.7 and later. In `deps.edn`: ```clojure -com.github.seancorfield/honeysql {:mvn/version "2.4.1002"} +com.github.seancorfield/honeysql {:mvn/version "2.4.1006"} ``` Required as: diff --git a/doc/getting-started.md b/doc/getting-started.md index 8b65e11..fb8c3c2 100644 --- a/doc/getting-started.md +++ b/doc/getting-started.md @@ -10,14 +10,14 @@ For the Clojure CLI, add the following dependency to your `deps.edn` file: ```clojure - com.github.seancorfield/honeysql {:mvn/version "2.4.1002"} + com.github.seancorfield/honeysql {:mvn/version "2.4.1006"} ``` For Leiningen, add the following dependency to your `project.clj` file: ```clojure - [com.github.seancorfield/honeysql "2.4.1002"] + [com.github.seancorfield/honeysql "2.4.1006"] ``` HoneySQL produces SQL statements but does not execute them. diff --git a/doc/special-syntax.md b/doc/special-syntax.md index 0ace7bf..3163133 100644 --- a/doc/special-syntax.md +++ b/doc/special-syntax.md @@ -352,6 +352,12 @@ parameters from them: ;;=> ["SELECT a, @var := 'foo'"] (sql/format {:select [:a [[:raw ["@var := " ["foo"]]]]]}) ;;=> ["SELECT a, @var := (?)" "foo"] +;; when multiple expressions are provided, the enclosing +;; vector can be omitted: +(sql/format {:select [:a [[:raw "@var := " [:inline "foo"]]]]}) +;;=> ["SELECT a, @var := 'foo'"] +(sql/format {:select [:a [[:raw "@var := " ["foo"]]]]}) +;;=> ["SELECT a, @var := (?)" "foo"] ``` `:raw` is also supported as a SQL clause for the same reason.