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

fix #523

Browse source 
Signed-off-by: Sean Corfield <sean@corfield.org>
This commit is contained in:
Sean Corfield 2024-02-03 12:37:43 -08:00
parent 9b611bb7ff
commit 2149a80852
No known key found for this signature in database
4 changed files with 21 additions and 3 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
* 2.5.next in progress
* Address [#523](https://github.com/seancorfield/honeysql/issues/523) by expanding examples in README **Functions** to show aliases.
* Address [#522](https://github.com/seancorfield/honeysql/issues/522) by supporting metadata on table specifications in `:from` and `:join` clauses to provide index hints (SQL Server).
* Address [#520](https://github.com/seancorfield/honeysql/issues/520) by expanding how `:inline` works, to support a sequence of arguments.
* Fix [#518](https://github.com/seancorfield/honeysql/issues/518) by moving temporal clause before alias.

19
README.md
View file

@ -565,6 +565,11 @@ keywords that begin with `%` are interpreted as SQL function calls:
=> ["SELECT COUNT(*) FROM foo"]
```
```clojure
;; with an alias:
(-> (select [:%count.* :total]) (from :foo) sql/format)
=> ["SELECT COUNT(*) AS total FROM foo"]
```
```clojure
(-> (select :%max.id) (from :foo) sql/format)
=> ["SELECT MAX(id) FROM foo"]
```
@ -578,6 +583,10 @@ regular function calls in a select:
=> ["SELECT COUNT(*) FROM foo"]
```
```clojure
(-> (select [[:count :*] :total]) (from :foo) sql/format)
=> ["SELECT COUNT(*) AS total FROM foo"]
```
```clojure
(-> (select [:%count.*]) (from :foo) sql/format)
=> ["SELECT COUNT(*) FROM foo"]
;; or even:
@ -587,16 +596,22 @@ regular function calls in a select:
```clojure
(-> (select [[:max :id]]) (from :foo) sql/format)
=> ["SELECT MAX(id) FROM foo"]
(-> (select [[:max :id] :highest]) (from :foo) sql/format)
=> ["SELECT MAX(id) AS highest FROM foo"]
;; the pure data DSL requires an extra level of brackets:
(-> {:select [[[:max :id]]], :from [:foo]} sql/format)
=> ["SELECT MAX(id) FROM foo"]
(-> {:select [[[:max :id] :highest]], :from [:foo]} sql/format)
=> ["SELECT MAX(id) AS highest FROM foo"]
;; the shorthand makes this simpler:
(-> {:select [[:%max.id]], :from [:foo]} sql/format)
=> ["SELECT MAX(id) FROM foo"]
;; or even:
(-> {:select [[:%max.id :highest]], :from [:foo]} sql/format)
=> ["SELECT MAX(id) AS highest FROM foo"]
;; or even (no alias):
(-> {:select [:%max.id], :from [:foo]} sql/format)
=> ["SELECT MAX(id) FROM foo"]
;; or even:
;; or even (no alias, no other columns):
(-> {:select :%max.id, :from :foo} sql/format)
=> ["SELECT MAX(id) FROM foo"]
```

2
src/honey/sql.cljc
View file

@ -195,7 +195,7 @@
(defn upper-case
"Upper-case a string in Locale/US to avoid locale-specific capitalization."
[^String s]
(.. s toString (toUpperCase (java.util.Locale/US))))
(.. s toString (toUpperCase java.util.Locale/US)))
:cljr
(defn upper-case
"Upper-case a string in Locale/US to avoid locale-specific capitalization."

2
src/honey/sql/helpers.cljc
View file

@ -1185,4 +1185,6 @@
(where [:in (composite :first :second)
[(composite 1 2) (composite 2 1)]])
(h/format))
(-> (select [:%count.* :total]) (from :foo) h/format)
(-> (select [[:count :*] :total]) (from :foo) h/format)
)