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

Handle :nulls-first and :nulls-last in order-by

Browse source 
This commit implements NULLS (FIRST | LAST) in ORDER BY clause, as
introduced by SQL:2003, link to grammar specification:
http://savage.net.au/SQL/sql-2003-2.bnf.html#sort%20specification%20list

Only PostgreSQL 8.4+ and Oracle 10+ support said feature as of
currently.
This commit is contained in:
Andrii V. Mishkovskyi 2015-04-17 12:29:44 +02:00
parent 7160b4b1ad
commit 500b55775e
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/honeysql/format.clj
View file

@ -412,15 +412,16 @@
(str "ORDER BY "
(comma-join (for [field fields]
(if (sequential? field)
(let [[field order & [nulls-order]] field]
;; Correct way of handling this would be to
;; expect a dictionary with either order,
;; nulls order or both at the same
;; time. However, so far I'm not sure how to
;; achieve that, so first iteration will have
;; to use dirty hacks.
(str (to-sql field) " " (if (= :desc order)
"DESC" "ASC")))
(let [[field & modifiers] field]
(string/join " "
(cons (to-sql field)
(for [modifier modifiers]
(case modifier
:desc "DESC"
:asc "ASC"
:nulls-first "NULLS FIRST"
:nulls-last "NULLS LAST"
"")))))
(to-sql field))))))
(defmethod format-clause :limit [[_ limit] _]