Added ascNullsLast and descNullsFirst

Fixes #560
tomjaguarpaw · Sep 1, 2022 · c52705b · c52705b
1 parent 5f8d7f3
commit c52705b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@
  report it on [the issue
  tracker](https://github.com/tomjaguarpaw/haskell-opaleye/issues/new).
 
+* Added `ascNullsLast` and `descNullsFirst`.
+
 ## 0.9.3.3
 
 * No externally visible changes

diff --git a/src/Opaleye/Order.hs b/src/Opaleye/Order.hs
@@ -77,6 +77,17 @@ ascNullsFirst :: SqlOrd b => (a -> F.Field_ n b) -> O.Order a
 ascNullsFirst = O.order HPQ.OrderOp { HPQ.orderDirection = HPQ.OpAsc
  , HPQ.orderNulls = HPQ.NullsFirst }
 
+-- | Specify an ascending ordering by the given expression.
+-- (Any NULLs appear last)
+ascNullsLast :: SqlOrd b => (a -> F.Field_ n b) -> O.Order a
+ascNullsLast = O.order HPQ.OrderOp { HPQ.orderDirection = HPQ.OpAsc
+ , HPQ.orderNulls = HPQ.NullsLast }
+
+-- | Specify an descending ordering by the given expression.
+-- (Any NULLs appear first)
+descNullsFirst :: SqlOrd b => (a -> F.Field_ n b) -> O.Order a
+descNullsFirst = O.order HPQ.OrderOp { HPQ.orderDirection = HPQ.OpDesc
+ , HPQ.orderNulls = HPQ.NullsFirst }
 
 -- | Specify an descending ordering by the given expression.
 -- (Any NULLs appear last)