From 11fcfd525741143203303e45ebb5653038dd3122 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Thu, 6 May 2021 22:12:46 -0700 Subject: [PATCH] Prep for 2.0.0-rc1 --- CHANGELOG.md | 2 +- README.md | 4 ++-- doc/differences-from-1-x.md | 2 +- doc/general-reference.md | 2 +- doc/getting-started.md | 12 ++++++------ pom.xml | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d73c680..63f1ef6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changes -* 2.0.next in progress +* 2.0.0-rc1 (for testing; 2021-05-06) * Fix #324 so that `insert-into` supports merging into another statement in all cases. * Fix #323 by supporting more than one SQL entity in `:on-conflict`. * Fix #321 by adding `:checking` mode. Currently only detects potential problems with `IN` clauses. diff --git a/README.md b/README.md index a863227..1f26a21 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ 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-beta2)](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-beta2) +[![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) -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. +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. HoneySQL 2.x requires Clojure 1.9 or later. diff --git a/doc/differences-from-1-x.md b/doc/differences-from-1-x.md index 8217ec6..c0f041b 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-beta2"} +com.github.seancorfield/honeysql {:mvn/version "2.0.0-rc1"} ;; in use: (ns my.project diff --git a/doc/general-reference.md b/doc/general-reference.md index 660d3ca..cce936a 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-beta2/api/honey.sql.helpers) namespace. +[honey.sql.helpers](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-rc1/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 019373f..e7e3615 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-beta2"} + com.github.seancorfield/honeysql {:mvn/version "2.0.0-rc1"} ``` For Leiningen, add the following dependency to your `project.clj` file: ```clojure - [com.github.seancorfield/honeysql "2.0.0-beta2"] + [com.github.seancorfield/honeysql "2.0.0-rc1"] ``` HoneySQL produces SQL statements but does not execute them. @@ -314,11 +314,11 @@ was wrapped in `[:inline `..`]`: The `:checking` option defaults to `:none`. If `:checking :basic` is specified, certain obvious errors -- such as `IN` with an empty collection -- -is treated as an error and an exception is thrown. If `:checking :strict` +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 -- is also treated as an error and an exception is +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.next]_ +to help avoid generating illegal SQL. _[New in version 2.0.0-rc1]_ `format` accepts options as either a single hash map argument or as named arguments (alternating keys and values). If you are using @@ -335,7 +335,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-beta2/api/honey.sql.helpers) namespace. +[honey.sql.helpers](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-rc1/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 50ffdaa..2f661a7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.github.seancorfield honeysql - 2.0.0-beta2 + 2.0.0-rc1 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-beta2 + v2.0.0-rc1