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

Merge pull request #420 from robhanlon22/with-materialization

Browse source 
Support materialization control in WITH
This commit is contained in:
Sean Corfield 2022-08-16 17:45:11 -07:00 committed by GitHub
commit e0157263ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/honey/sql.cljc
View file

@ -521,18 +521,20 @@
(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] (defn- format-with [k xs as-fn]
;; 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 [[sqls params]
(reduce-sql (map (fn [[x expr]] (reduce-sql
(let [[sql & params] (format-with-part x) (map
[sql' & params'] (format-dsl expr)] (fn [[x expr :as with]]
;; according to docs, CTE should _always_ be wrapped: (let [[sql & params] (format-with-part x)
(cond-> [(str sql " AS " (str "(" sql' ")"))] [sql' & params'] (format-dsl expr)]
params (into params) ;; according to docs, CTE should _always_ be wrapped:
params' (into params')))) (cond-> [(str sql " " (as-fn with) " " (str "(" sql' ")"))]
xs))] params (into params)
params' (into params'))))
xs))]
(into [(str (sql-kw k) " " (str/join ", " sqls))] params))) (into [(str (sql-kw k) " " (str/join ", " sqls))] params)))
(defn- format-selector [k xs] (defn- format-selector [k xs]
@ -989,8 +991,15 @@
: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 #'format-with :with (let [as-fn
:with-recursive #'format-with (fn [[_ _ materialization]]
(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

6
test/honey/sql_test.cljc
View file

@ -124,6 +124,12 @@
(deftest test-cte (deftest test-cte
(is (= (format {:with [[:query {:select [:foo] :from [:bar]}]]}) (is (= (format {:with [[:query {:select [:foo] :from [:bar]}]]})
["WITH query AS (SELECT foo FROM bar)"])) ["WITH query AS (SELECT foo FROM bar)"]))
(is (= (format {:with [[:query {:select [:foo] :from [:bar]} :materialized]]})
["WITH query AS MATERIALIZED (SELECT foo FROM bar)"]))
(is (= (format {:with [[:query {:select [:foo] :from [:bar]} :not-materialized]]})
["WITH query AS NOT MATERIALIZED (SELECT foo FROM bar)"]))
(is (= (format {:with [[:query {:select [:foo] :from [:bar]} :unknown]]})
["WITH query AS (SELECT foo FROM bar)"]))
(is (= (format {:with [[:query1 {:select [:foo] :from [:bar]}] (is (= (format {:with [[:query1 {:select [:foo] :from [:bar]}]
[:query2 {:select [:bar] :from [:quux]}]] [:query2 {:select [:bar] :from [:quux]}]]
:select [:query1.id :query2.name] :select [:query1.id :query2.name]