Prep for 2.0.0-beta2

CHANGELOG.md

@@ -1,12 +1,13 @@
 # Changes
 
-* 2.0.next in progress
+* 2.0.0-beta2 (for testing; 2021-04-13)
   * The documentation continues to be expanded and clarified in response to feedback!
-  * Fix #322 by rewriting/simplifying `WHERE`/`HAVING` merge logic.
+  * Fix #322 by rewriting/simplifying `WHERE`/`HAVING` merge logic. **Important bug fix!**
   * Fix #310 by adding support for `FILTER`, `WITHIN GROUP`, and `ORDER BY` (as an expression), from [nilenso/honeysql-postgres](https://github.com/nilenso/honeysql-postgres) 0.4.112. These are [Special Syntax](doc/special-syntax.md) and there are also helpers for `filter` and `within-group` -- so **be careful about referring in all of `honey.sql.helpers`** since it will now shadow `clojure.core/filter` (it already shadows `for`, `group-by`, `into`, `partition-by`, `set`, and `update`).
   * Fix #308 by supporting join clauses in `join-by` (and correcting the helper docstring).
 
 * 2.0.0-beta1 (for testing; 2021-04-09)
+  * **The merging behavior of `where`/`having` is broken in Beta 1!**
   * Since Alpha 3, more documentation has been written and existing documentation clarified (addressing #300, #309, #313, #314).
   * Fix #319 by ensuring `register-clause!` is idempotent.
   * Fix #317 by dropping qualifiers in `:set` clauses (just like we do with `:insert` columns). Note that you can still use explicit _dotted_ names if you want table qualification.

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-beta1)](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-beta1)
+[![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)
 
 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.
 

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-beta1"}
+com.github.seancorfield/honeysql {:mvn/version "2.0.0-beta2"}
 
 ;; in use:
 (ns my.project

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-beta1/api/honey.sql.helpers) namespace.
+[honey.sql.helpers](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-beta2/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.

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-beta1"}
+    com.github.seancorfield/honeysql {:mvn/version "2.0.0-beta2"}
 ```
 
 For Leiningen, add the following dependency to your `project.clj` file:
 
 ```clojure
-    [com.github.seancorfield/honeysql "2.0.0-beta1"]
+    [com.github.seancorfield/honeysql "2.0.0-beta2"]
 ```
 
 HoneySQL produces SQL statements but does not execute them.
@@ -327,7 +327,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-beta1/api/honey.sql.helpers) namespace.
+[honey.sql.helpers](https://cljdoc.org/d/com.github.seancorfield/honeysql/2.0.0-beta2/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

doc/postgresql.md

@@ -341,7 +341,7 @@ user=> (sql/format (alter-table :fruit
 
 `honeysql-postgres` added support for `FILTER` and `WITHIN GROUP`
 in its 0.4.112 release. Those features have been integrated into
-HoneySQL 2.x (as of 2.0.next), along with support for `ORDER BY`
+HoneySQL 2.x (as of 2.0.0-beta2), along with support for `ORDER BY`
 in expressions. `:filter`, `:within-group`, and `:order-by` are
 all available as "functions" in [Special Syntax](special-syntax.md),
 and there are helpers for `filter` and `within-group`.

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.seancorfield</groupId>
   <artifactId>honeysql</artifactId>
-  <version>2.0.0-beta1</version>
+  <version>2.0.0-beta2</version>
   <name>honeysql</name>
   <description>SQL as Clojure data structures.</description>
   <url>https://github.com/seancorfield/honeysql</url>
@@ -25,7 +25,7 @@
     <url>https://github.com/seancorfield/honeysql</url>
     <connection>scm:git:git://github.com/seancorfield/honeysql.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/seancorfield/honeysql.git</developerConnection>
-    <tag>v2.0.0-beta1</tag>
+    <tag>v2.0.0-beta2</tag>
   </scm>
   <dependencies>
     <dependency>