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

fix #370

Browse source
This commit is contained in:
Sean Corfield 2021-11-26 22:40:51 -08:00
parent be1df97b2b
commit d660c059d4
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,7 +1,8 @@
# Changes # Changes
* 2.1.next in progress * 2.1.next in progress
* Fix #371 by always parenthesizing the operand of `NOT`. * Fix #371 by treating the operand of `NOT` as a nested expression (so it is parenthesized unless it is a simple value).
* Fix #370 by **always** parenthesizing the operand of `:nest`.
* 2.1.818 -- 2021-10-04 * 2.1.818 -- 2021-10-04
* Fix #367 by supporting parameters in subexpressions around `IS NULL` / `IS NOT NULL` tests. * Fix #367 by supporting parameters in subexpressions around `IS NULL` / `IS NOT NULL` tests.

7
src/honey/sql.cljc
View file

@ -868,7 +868,9 @@
:drop-materialized-view #'format-drop-items :drop-materialized-view #'format-drop-items
:refresh-materialized-view (fn [_ x] (format-create :refresh :materialized-view x nil)) :refresh-materialized-view (fn [_ x] (format-create :refresh :materialized-view x nil))
:raw (fn [_ x] (raw-render x)) :raw (fn [_ x] (raw-render x))
:nest (fn [_ x] (format-expr x {:nested true})) :nest (fn [_ x]
(let [[sql & params] (format-expr x)]
(into [(str "(" sql ")")] params)))
:with #'format-with :with #'format-with
:with-recursive #'format-with :with-recursive #'format-with
:intersect #'format-on-set-op :intersect #'format-on-set-op
@ -1180,7 +1182,8 @@
{::wrapper (fn [fx _] (fx))})])) {::wrapper (fn [fx _] (fx))})]))
:nest :nest
(fn [_ [x]] (fn [_ [x]]
(format-expr x {:nested true})) (let [[sql & params] (format-expr x)]
(into [(str "(" sql ")")] params)))
:not :not
(fn [_ [x]] (fn [_ [x]]
(let [[sql & params] (format-expr x {:nested true})] (let [[sql & params] (format-expr x {:nested true})]