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

add :alias special syntax #497

Browse source
This commit is contained in:
Sean Corfield 2023-08-11 19:06:30 -07:00
parent c7ec650cfc
commit d187c66987
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
# Changes # Changes
* 2.4.next in progress * 2.4.next in progress
* Address [#497](https://github.com/seancorfield/honeysql/issues/497) by adding `:alias` special syntax. Documentation TBD.
* Attempt to clarify the formatting behavior of the `:values` clause when used to produce column names. * Attempt to clarify the formatting behavior of the `:values` clause when used to produce column names.
* Update `tools.build` to 0.9.5 (and remove `:java-opts` setting from `build/run-task`) * Update `tools.build` to 0.9.5 (and remove `:java-opts` setting from `build/run-task`)

19
src/honey/sql.cljc
View file

@ -223,7 +223,11 @@
Handles quoting, splitting at / or ., replacing - with _ etc." Handles quoting, splitting at / or ., replacing - with _ etc."
[e & [{:keys [aliased drop-ns]}]] [e & [{:keys [aliased drop-ns]}]]
(let [col-fn (if (or *quoted* (string? e)) (let [e (if (and aliased (keyword? e) (= \' (first (name e))))
;; #497 quoted alias support (should behave like string)
(subs (name e) 1)
e)
col-fn (if (or *quoted* (string? e))
(if *quoted-snake* name-_ name) (if *quoted-snake* name-_ name)
name-_) name-_)
col-e (col-fn e) col-e (col-fn e)
@ -1494,6 +1498,8 @@
;; used in DDL to force rendering as a SQL entity instead ;; used in DDL to force rendering as a SQL entity instead
;; of a SQL keyword: ;; of a SQL keyword:
:entity (fn [_ [e]] [(format-entity e)]) :entity (fn [_ [e]] [(format-entity e)])
;; #497 used to force rendering as an alias:
:alias (fn [_ [e]] [(format-entity e {:aliased true})])
;; bigquery column types: ;; bigquery column types:
:bigquery/array (fn [_ spec] :bigquery/array (fn [_ spec]
[(str "ARRAY<" [(str "ARRAY<"
@ -2098,4 +2104,15 @@
(sql/format {:insert-into :foo :output [:inserted.*] :values [{:bar 1}]}) (sql/format {:insert-into :foo :output [:inserted.*] :values [{:bar 1}]})
(sql/format {:insert-into :foo :columns [:bar] :output [:inserted.*] :values [[1]]}) (sql/format {:insert-into :foo :columns [:bar] :output [:inserted.*] :values [[1]]})
;; issue-497
(honey.sql/format {:select [[:column-name "some-alias"]]
:from :b
:order-by [[[:raw "\"some-alias\""]]]})
(honey.sql/format {:select [[:column-name "some-alias"]]
:from :b
:order-by [[[:alias "some-alias"]]]})
(honey.sql/format {:select [[:column-name "some-alias"]]
:from :b
:order-by [[[:alias "some-alias"]]]}
{:quoted true})
) )