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

Support expressions in WITH clauses

Browse source
This commit is contained in:
Nikita Domnitskii 2025-01-16 18:25:52 +06:00
parent 8e0d6984bd
commit f05c7051e2
No known key found for this signature in database
GPG key ID: 8469C699F6646AC6
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/honey/sql.cljc
View file

@ -943,7 +943,7 @@
(map
(fn [[x expr & tail :as with]]
(let [[sql & params] (format-with-part x)
non-query-expr? (or (ident? expr) (string? expr))
non-query-expr? (not (map? expr))
[sql' & params'] (if non-query-expr?
(format-expr expr)
(format-dsl expr))

21
test/honey/sql_test.cljc
View file

@ -221,7 +221,26 @@
:from [:hits :stuff]
:where [:= :EventDate :ts_upper_bound]})
["WITH ? AS ts_upper_bound, stuff AS (SELECT * FROM songs) SELECT * FROM hits, stuff WHERE EventDate = ts_upper_bound"
"2019-08-01 15:23:00"]))))
"2019-08-01 15:23:00"])))
(testing "Use expression in a WITH clause"
(is (= (format
{:with [[:s [:sum :bytes]]]
:select [:s]
:from [:table]})
["WITH SUM(bytes) AS s SELECT s FROM table"]))
(is (= (format
{:with [[:v [:raw "m['k']"]]]
:select [:v]
:from [:table]})
["WITH m['k'] AS v SELECT v FROM table"]))
(is (= (format
{:with [[:cond [:and [:= :a 1] [:= :b 2] [:= :c 3]]]]
:select [:v]
:from [:table]
:where :cond})
["WITH (a = ?) AND (b = ?) AND (c = ?) AS cond SELECT v FROM table WHERE cond" 1 2 3]))))
(deftest insert-into
(is (= (format {:insert-into :foo})