diff --git a/CHANGELOG.md b/CHANGELOG.md index 6931b8d..2b29836 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changes -* 2.0.next in progress +* 2.0.0-rc2 (for testing; 2021-05-10) * Fix #326 by allowing `ON`/`USING` to be optional and not dropping parameters on the floor. * Fix #325 by making the `%` function call syntax respect `:quoted true` and/or `:dialect` options, and also allowing for qualified column names. (PR from @lognush) * Add `:quoted-snake true` option to force conversion from kebab-case to snake_case when `:quoted true` or a `:dialect` is specified to `format`. diff --git a/README.md b/README.md index 1f26a21..6e95c3f 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.0.0-rc1)](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-rc1) +[![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.0.0-rc2)](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-rc2) Once the prerelease testing is complete, this project will follow 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 365c159..e380668 100644 --- a/doc/differences-from-1-x.md +++ b/doc/differences-from-1-x.md @@ -49,7 +49,7 @@ Supported Clojure versions: 1.7 and later. ```clojure ;; in deps.edn: -com.github.seancorfield/honeysql {:mvn/version "2.0.0-rc1"} +com.github.seancorfield/honeysql {:mvn/version "2.0.0-rc2"} ;; in use: (ns my.project @@ -85,7 +85,7 @@ The `:quoting ` option has superseded by the new dialect machinery and Identifiers are automatically quoted if you specify a `:dialect` option to `format`, unless you also specify `:quoted false`. The following options are no longer supported: -* `:allow-dashed-names?` -- if you provide dashed-names in 2.x, they will be left as-is if quoting is enabled, else they will be converted to snake_case (so you will either get `"dashed-names"` with quoting or `dashed_names` without). If you want dashed-names to be converted to snake_case when `:quoted true`, you also need to specify `:quoted-snake true`. _[New in 2.0.next]_ +* `:allow-dashed-names?` -- if you provide dashed-names in 2.x, they will be left as-is if quoting is enabled, else they will be converted to snake_case (so you will either get `"dashed-names"` with quoting or `dashed_names` without). If you want dashed-names to be converted to snake_case when `:quoted true`, you also need to specify `:quoted-snake true`. * `:allow-namespaced-names?` -- this supported `foo/bar` column names in SQL which I'd like to discourage. * `:namespace-as-table?` -- this is the default in 2.x: `:foo/bar` will be treated as `foo.bar` which is more in keeping with `next.jdbc`. * `:parameterizer` -- this would add a lot of complexity to the formatting engine and I do not know how widely it was used (especially in its arbitrarily extensible form). diff --git a/doc/general-reference.md b/doc/general-reference.md index cce936a..6c460ed 100644 --- a/doc/general-reference.md +++ b/doc/general-reference.md @@ -114,6 +114,6 @@ section. The full list of "special syntax" functions is documented in the [Special Syntax](special-syntax.md) section. The best documentation for the helper functions is in the -[honey.sql.helpers](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-rc1/api/honey.sql.helpers) namespace. +[honey.sql.helpers](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-rc2/api/honey.sql.helpers) namespace. If you're migrating to HoneySQL 2.x, this [overview of differences between 1.x and 2.x](differences-from-1-x.md) should help. diff --git a/doc/getting-started.md b/doc/getting-started.md index f4e63b3..949d6a1 100644 --- a/doc/getting-started.md +++ b/doc/getting-started.md @@ -9,13 +9,13 @@ data to a SQL statement (string) and any parameters it needs. For the Clojure CLI, add the following dependency to your `deps.edn` file: ```clojure - com.github.seancorfield/honeysql {:mvn/version "2.0.0-rc1"} + com.github.seancorfield/honeysql {:mvn/version "2.0.0-rc2"} ``` For Leiningen, add the following dependency to your `project.clj` file: ```clojure - [com.github.seancorfield/honeysql "2.0.0-rc1"] + [com.github.seancorfield/honeysql "2.0.0-rc2"] ``` HoneySQL produces SQL statements but does not execute them. @@ -325,7 +325,7 @@ are treated as an error and an exception is thrown. If `:checking :strict` is specified, certain dubious constructs -- such as `IN` with a collection containing `NULL` values -- are also treated as an error and an exception is thrown. It is expected that this feature will be expanded over time -to help avoid generating illegal SQL. _[New in version 2.0.0-rc1]_ +to help avoid generating illegal SQL. `format` accepts options as either a single hash map argument or as named arguments (alternating keys and values). If you are using @@ -342,7 +342,7 @@ section. The full list of "special syntax" functions is documented in the [Special Syntax](special-syntax.md) section. The best documentation for the helper functions is in the -[honey.sql.helpers](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-rc1/api/honey.sql.helpers) namespace. +[honey.sql.helpers](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-rc2/api/honey.sql.helpers) namespace. More detail about certain core HoneySQL functionality can be found in the [Reference documentation](general-reference.md). If you're migrating to HoneySQL 2.x, this [overview of differences diff --git a/pom.xml b/pom.xml index 2f661a7..96e19a9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.github.seancorfield honeysql - 2.0.0-rc1 + 2.0.0-rc2 honeysql SQL as Clojure data structures. https://github.com/seancorfield/honeysql @@ -25,7 +25,7 @@ https://github.com/seancorfield/honeysql scm:git:git://github.com/seancorfield/honeysql.git scm:git:ssh://git@github.com/seancorfield/honeysql.git - v2.0.0-rc1 + v2.0.0-rc2