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

a simplification to prepare for #542

Browse source 
Signed-off-by: Sean Corfield <sean@corfield.org>
This commit is contained in:
Sean Corfield 2024-09-21 18:33:43 -07:00
parent dd9547bbc1
commit 150fcda6d3
No known key found for this signature in database
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/honey/sql.cljc
View file

@ -822,10 +822,16 @@
(into [(str (format-entity (first x)) " " sql)] params)) (into [(str (format-entity (first x)) " " sql)] params))
[(format-entity x)])) [(format-entity x)]))
(defn- format-with [k xs as-fn] (defn- format-with [k xs]
;; TODO: a sequence of pairs -- X AS expr -- where X is either [entity expr] ;; TODO: a sequence of pairs -- X AS expr -- where X is either [entity expr]
;; or just entity, as far as I can tell... ;; or just entity, as far as I can tell...
(let [[sqls params] (let [as-fn
(fn [[_ _ materialization]]
(condp = materialization
:materialized "AS MATERIALIZED"
:not-materialized "AS NOT MATERIALIZED"
"AS"))
[sqls params]
(reduce-sql (reduce-sql
(map (map
(fn [[x expr :as with]] (fn [[x expr :as with]]
@ -1487,15 +1493,8 @@
:nest (fn [_ x] :nest (fn [_ x]
(let [[sql & params] (format-dsl x {:nested true})] (let [[sql & params] (format-dsl x {:nested true})]
(into [sql] params))) (into [sql] params)))
:with (let [as-fn :with #'format-with
(fn [[_ _ materialization]] :with-recursive #'format-with
(condp = materialization
:materialized "AS MATERIALIZED"
:not-materialized "AS NOT MATERIALIZED"
"AS"))]
(fn [k xs] (format-with k xs as-fn)))
:with-recursive (let [as-fn (constantly "AS")]
(fn [k xs] (format-with k xs as-fn)))
:intersect #'format-on-set-op :intersect #'format-on-set-op
:union #'format-on-set-op :union #'format-on-set-op
:union-all #'format-on-set-op :union-all #'format-on-set-op