diff --git a/CHANGELOG.md b/CHANGELOG.md index e745125..6293e4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changes * 2.3.next in progress + * Fix [#431](https://github.com/seancorfield/honeysql/issues/431). * Address [#430](https://github.com/seancorfield/honeysql/issues/430) by treating `:'` as introducing a name that should be treating literally and not formatted as a SQL entity (which respects quoting, dot-splitting, etc); this effectively expands the "escape hatch" introduced via [#352](https://github.com/seancorfield/honeysql/issues/352) in 2.2.868. _Note that the function context behavior formats as a SQL entity, rather than the usual SQL "keyword", whereas this new context is a literal transcription rather than as a SQL entity!_ * Address [#427](https://github.com/seancorfield/honeysql/issues/427) by adding `set-options!`. * Address [#415](https://github.com/seancorfield/honeysql/issues/415) by supporting multiple column names in `ADD COLUMN`, `ALTER COLUMN`, `DROP COLUMN`, and `MODIFY COLUMN`. diff --git a/src/honey/sql/helpers.cljc b/src/honey/sql/helpers.cljc index ff1b2c1..52e6daa 100644 --- a/src/honey/sql/helpers.cljc +++ b/src/honey/sql/helpers.cljc @@ -127,7 +127,7 @@ (defn- helper-merge [data k args] (if-let [merge-fn (special-merges k)] - (if-let [clause (merge-fn (get data k) args)] + (if-some [clause (merge-fn (get data k) args)] (assoc data k clause) data) (clojure.core/update data k default-merge args)))