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

address #504 by adding ignore/respect null support

Browse source
This commit is contained in:
Sean Corfield 2023-09-08 21:55:24 -07:00
parent 654a1cb67a
commit 75830df509
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,5 +1,8 @@
# Changes # Changes
* 2.4.next in progress
* Address [#504](https://github.com/seancorfield/honeysql/issues/504) by adding special syntax for ignore/respect nulls. More work will be needed to support distinct/order by/limit in BigQuery array aggregation.
* 2.4.1066 -- 2023-08-27 * 2.4.1066 -- 2023-08-27
* Add `:select` with function call and alias example to README (PR [#502](https://github.com/seancorfield/honeysql/pull/502) [@markbastian](https://github.com/markbastian)). * Add `:select` with function call and alias example to README (PR [#502](https://github.com/seancorfield/honeysql/pull/502) [@markbastian](https://github.com/markbastian)).
* Address [#501](https://github.com/seancorfield/honeysql/issues/501) by making `INSERT INTO` (and `REPLACE INTO`) use the `:columns` or `:values` clauses to produce column names (which are then omitted from those other clauses). * Address [#501](https://github.com/seancorfield/honeysql/issues/501) by making `INSERT INTO` (and `REPLACE INTO`) use the `:columns` or `:values` clauses to produce column names (which are then omitted from those other clauses).

12
doc/special-syntax.md
View file

@ -215,6 +215,18 @@ FROM aa
100] 100]
``` ```
## ignore/respect nulls
Both of these accept a single argument -- an expression -- and
renders that expression followed by `IGNORE NULLS` or `RESPECT NULLS`:
```clojure
(sql/format-expr [:array_agg [:ignore-nulls :a]])
;;=> ["ARRAY_AGG(a IGNORE NULLS)"]
(sql/format-expr [:array_agg [:respect-nulls :a]])
;;=> ["ARRAY_AGG(a RESPECT NULLS)"]
```
## inline ## inline
Accepts a single argument and tries to render it as a Accepts a single argument and tries to render it as a

6
src/honey/sql.cljc
View file

@ -1605,6 +1605,10 @@
(into paramsx) (into paramsx)
(into params)))) (into params))))
(defn ignore-respect-nulls [k [x]]
(let [[sql & params] (format-expr x)]
(into [(str sql " " (sql-kw k))] params)))
(def ^:private special-syntax (def ^:private special-syntax
(atom (atom
{;; these "functions" are mostly used in column {;; these "functions" are mostly used in column
@ -1686,6 +1690,7 @@
(into params-p) (into params-p)
(into params-e)))) (into params-e))))
:filter expr-clause-pairs :filter expr-clause-pairs
:ignore-nulls ignore-respect-nulls
:inline :inline
(fn [_ [x]] (fn [_ [x]]
(binding [*inline* true] (binding [*inline* true]
@ -1766,6 +1771,7 @@
(raw-render (first xs)) (raw-render (first xs))
;; ...but allow for multiple arguments now: ;; ...but allow for multiple arguments now:
(raw-render xs))) (raw-render xs)))
:respect-nulls ignore-respect-nulls
:within-group expr-clause-pairs})) :within-group expr-clause-pairs}))
(defn- format-equality-expr [op' op expr nested] (defn- format-equality-expr [op' op expr nested]