Merge branch 'develop' into bb-test-runner

seancorfield · Oct 29, 2024 · 7892ec6 · 7892ec6
2 parents 3628185 + 643cea4
commit 7892ec6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changes
 
+* 2.6.next in progress
+  * Fix [#549](https://github.com/seancorfield/honeysql/issues/549) by using `:bb` conditionals to support Babashka (and still support Clojure 1.9.0).
+
 * 2.6.1203 -- 2024-10-22
   * Fix [#548](https://github.com/seancorfield/honeysql/issues/548) which was a regression introduced in [#526](https://github.com/seancorfield/honeysql/issues/526) (in 2.6.1161).
   * Address [#542](https://github.com/seancorfield/honeysql/issues/542) by adding support for `WITH` query tail options for PostgreSQL.

diff --git a/src/honey/sql.cljc b/src/honey/sql.cljc
@@ -419,7 +419,7 @@
 (defn- format-simple-var
   ([x]
    (let [c (if (keyword? x)
-             #?(:bb (str (symbol x))
+             #?(:bb  (str (symbol x))
                 :clj (str (.sym ^clojure.lang.Keyword x)) ;; Omits leading colon
                 :default (subs (str x) 1))
              (str x))]
@@ -438,7 +438,7 @@
    ;; for multiple / in the %fun.call case so that
    ;; qualified column names can be used:
    (let [c (if (keyword? x)
-             #?(:bb (str (symbol x))
+             #?(:bb  (str (symbol x))
                 :clj (str (.sym ^clojure.lang.Keyword x)) ;; Omits leading colon
                 :default (subs (str x) 1))
              (str x))]