Prepare for beam-core 0.10.4.0 release

Author: LaurentRDC

beam-core/ChangeLog.md

@@ -1,9 +1,10 @@
-# Unreleased
+# 0.10.4.0
 
 ## Added features
 
 * Added a `Generic` instance to `SqlNull`, `SqlBitString`, and `SqlSerial` (#736).
 * Added a note to `default_` to specify that it has more restrictions than its type may indicate (#744).
+* Added `limitMaybe_` and `offsetMaybe_` (#633).
 
 ## Updated dependencies
 

beam-core/Database/Beam/Query/Combinators.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE CPP #-}
 
 module Database.Beam.Query.Combinators
     ( -- * Various SQL functions and constructs
@@ -330,6 +329,8 @@ nub_ :: ( BeamSqlBackend be, Projectible be r )
 nub_ (Q sub) = Q $ liftF (QDistinct (\_ _ -> setQuantifierDistinct) sub id)
 
 -- | Limit the number of results returned by a query.
+--
+-- See also `limitMaybe_` to conditionally apply a limit.
 limit_ :: forall s a be db
         . ( Projectible be a
           , ThreadRewritable (QNested s) a )
@@ -338,6 +339,8 @@ limit_ limit' (Q q) =
   Q (liftF (QLimit limit' q (rewriteThread (Proxy @s))))
 
 -- | Conditionally limit the number of results returned by a query.
+--
+-- @since 0.10.4.0
 limitMaybe_ :: forall s a be db
         . ( Projectible be a
           , ThreadRewritable (QNested s) a )
@@ -348,15 +351,19 @@ limitMaybe_ (Just limit') (Q q) =
 -- See discussion on https://github.com/haskell-beam/beam/pull/633.
 limitMaybe_ Nothing (Q q) = Q (unsafeCoerce q)
 
--- | Drop the first `offset'` results.
+-- | Drop the first `offset` results.
+--
+-- See also `offsetMaybe_` to conditionally apply an offset
 offset_ :: forall s a be db
          . ( Projectible be a
            , ThreadRewritable (QNested s) a )
         => Integer -> Q be db (QNested s) a -> Q be db s (WithRewrittenThread (QNested s) s a)
 offset_ offset' (Q q) =
   Q (liftF (QOffset offset' q (rewriteThread (Proxy @s))))
 
--- | Conditionally drop the first `offset'` results.
+-- | Conditionally drop the first `offset` results.
+--
+-- @since 0.10.4.0
 offsetMaybe_ :: forall s a be db
          . ( Projectible be a
            , ThreadRewritable (QNested s) a )

beam-core/beam-core.cabal

@@ -2,7 +2,7 @@
 -- see http://haskell.org/cabal/users-guide/
 
 name:                beam-core
-version:             0.10.3.1
+version:             0.10.4.0
 synopsis:            Type-safe, feature-complete SQL query and manipulation interface for Haskell
 description:         Beam is a Haskell library for type-safe querying and manipulation of SQL databases.
                      Beam is modular and supports various backends. In order to use beam, you will need to use