luciano/honeysql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

omit for .cljs

Browse source 
Signed-off-by: Sean Corfield <sean@corfield.org>
This commit is contained in:
Sean Corfield 2024-01-06 22:39:25 -08:00
parent 1291b328d0
commit 35f4c674e9
No known key found for this signature in database
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -3,7 +3,7 @@
* 2.5.next in progress * 2.5.next in progress
* Address [#520](https://github.com/seancorfield/honeysql/issues/520) by expanding how `:inline` works, to support a sequence of arguments. * Address [#520](https://github.com/seancorfield/honeysql/issues/520) by expanding how `:inline` works, to support a sequence of arguments.
* Fix [#518](https://github.com/seancorfield/honeysql/issues/518) by moving temporal clause before alias. * Fix [#518](https://github.com/seancorfield/honeysql/issues/518) by moving temporal clause before alias.
* Address [#495](https://github.com/seancorfield/honeysql/issues/495) by adding (experimental) `format&` and `formatv` macros -- purely for discussion: may be removed in a subsequent release! * Address [#495](https://github.com/seancorfield/honeysql/issues/495) by adding (experimental) `format&` and `formatv` macros (`.clj` only!) -- purely for discussion: may be removed in a subsequent release!
* Implemented `CREATE INDEX` [#348](https://github.com/seancorfield/honeysql/issues/348) via PR [#517](https://github.com/seancorfield/honeysql/pull/517) [@dancek](https://github.com/dancek). * Implemented `CREATE INDEX` [#348](https://github.com/seancorfield/honeysql/issues/348) via PR [#517](https://github.com/seancorfield/honeysql/pull/517) [@dancek](https://github.com/dancek).
* 2.5.1103 -- 2023-12-03 * 2.5.1103 -- 2023-12-03

12
src/honey/sql.cljc
View file

@ -29,7 +29,7 @@
it uppercase and replaces - with space). " it uppercase and replaces - with space). "
(:refer-clojure :exclude [format]) (:refer-clojure :exclude [format])
(:require [clojure.string :as str] (:require [clojure.string :as str]
[clojure.template] #?(:clj [clojure.template])
[honey.sql.protocols :as p])) [honey.sql.protocols :as p]))
;; default formatting for known clauses ;; default formatting for known clauses
@ -2101,7 +2101,8 @@
[dsl & params] [dsl & params]
(format dsl {:params (zipmap (map (comp keyword str inc) (range)) params)})) (format dsl {:params (zipmap (map (comp keyword str inc) (range)) params)}))
(defmacro format& #?(:clj
(defmacro format&
"Experimental implementation of https://github.com/seancorfield/honeysql/issues/495 "Experimental implementation of https://github.com/seancorfield/honeysql/issues/495
Implicitly treats any locally bound symbol as a variable to be substituted Implicitly treats any locally bound symbol as a variable to be substituted
@ -2113,9 +2114,10 @@
=> SELECT * FROM table WHERE (42 = 13)" => SELECT * FROM table WHERE (42 = 13)"
[dsl & opts] [dsl & opts]
(let [syms (vec (keys &env))] (let [syms (vec (keys &env))]
`(honey.sql/format (clojure.template/apply-template '~syms ~dsl ~syms) ~@opts))) `(honey.sql/format (clojure.template/apply-template '~syms ~dsl ~syms) ~@opts))))
(defmacro formatv #?(:clj
(defmacro formatv
"Experimental implementation of https://github.com/seancorfield/honeysql/issues/495 "Experimental implementation of https://github.com/seancorfield/honeysql/issues/495
Treats the specified vector of symbols as variables to be substituted Treats the specified vector of symbols as variables to be substituted
@ -2126,7 +2128,7 @@
=> SELECT * FROM table WHERE (42 = y)" => SELECT * FROM table WHERE (42 = y)"
[syms sql & opts] [syms sql & opts]
`(honey.sql/format (clojure.template/apply-template '~syms ~sql ~syms) ~@opts)) `(honey.sql/format (clojure.template/apply-template '~syms ~sql ~syms) ~@opts)))
(defn set-dialect! (defn set-dialect!
"Set the default dialect for formatting. "Set the default dialect for formatting.