packages feed

rel8 1.3.0.0 → 1.3.1.0

raw patch · 11 files changed

+51/−89 lines, 11 filesdep ~opaleyePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: opaleye

API changes (from Hackage documentation)

Files

Changelog.md view
@@ -1,3 +1,9 @@+# 1.3.1.0 (2022-01-20)++## Other++* Rel8 now requires Opaleye >= 0.9.1. ([#165](https://github.com/circuithub/rel8/pull/165))+ # 1.3.0.0 (2022-01-31)  ## Breaking changes
rel8.cabal view
@@ -1,6 +1,6 @@ cabal-version:       2.0 name:                rel8-version:             1.3.0.0+version:             1.3.1.0 synopsis:            Hey! Hey! Can u rel8? license:             BSD3 license-file:        LICENSE@@ -27,7 +27,7 @@     , comonad     , contravariant     , hasql ^>= 1.4.5.1 || ^>= 1.5.0.0-    , opaleye ^>= 0.9.0.0+    , opaleye ^>= 0.9.1.0     , pretty     , profunctors     , product-profunctors
− src/Rel8/Aggregate.hs-boot 
@@ -1,11 +0,0 @@-{-# language PolyKinds #-}-{-# language RoleAnnotations #-}-{-# language StandaloneKindSignatures #-}--module Rel8.Aggregate where--import Data.Kind--type Aggregate :: k -> Type-type role Aggregate nominal-data Aggregate a
src/Rel8/Query.hs view
@@ -15,7 +15,7 @@ -- opaleye import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye import qualified Opaleye.Internal.PackMap as Opaleye-import qualified Opaleye.Internal.PrimQuery as Opaleye+import qualified Opaleye.Internal.PrimQuery as Opaleye hiding (lateral) import qualified Opaleye.Internal.QueryArr as Opaleye import qualified Opaleye.Internal.Tag as Opaleye @@ -175,14 +175,14 @@   instance Monad Query where-  Query q >>= f = Query $ \dummies -> Opaleye.QueryArr $ \(_, tag) ->+  Query q >>= f = Query $ \dummies -> Opaleye.stateQueryArr $ \_ tag ->     let-      Opaleye.QueryArr qa = q dummies-      ((m, a), query, tag') = qa ((), tag)+      qa = q dummies+      ((m, a), query, tag') = Opaleye.runStateQueryArr qa () tag       Query q' = f a       (dummies', query', tag'') =         ( dummy : dummies-        , \lateral -> Opaleye.Rebind True bindings . query lateral+        , query <> Opaleye.aRebind bindings         , Opaleye.next tag'         )         where@@ -190,11 +190,11 @@             where               random = Opaleye.FunExpr "random" []               name = Opaleye.extractAttr "dummy" tag'-      Opaleye.QueryArr qa' = Opaleye.lateral $ \_ -> q' dummies'-      ((m'@(Any needsDummies), b), query'', tag''') = qa' ((), tag'')+      qa' = Opaleye.lateral $ \_ -> q' dummies'+      ((m'@(Any needsDummies), b), query'', tag''') = Opaleye.runStateQueryArr qa' () tag''       query'''-        | needsDummies = \lateral -> query'' lateral . query' lateral-        | otherwise = \lateral -> query'' lateral . query lateral+        | needsDummies = query' <> query''+        | otherwise = query <> query''       m'' = m <> m'     in       ((m'', b), query''', tag''')
src/Rel8/Query/Distinct.hs view
@@ -1,5 +1,3 @@-{-# options_ghc -fno-warn-redundant-constraints #-}- module Rel8.Query.Distinct   ( distinct   , distinctOn@@ -8,12 +6,11 @@ where  -- base-import Prelude+import Prelude ()  -- opaleye-import qualified Opaleye.Distinct as Opaleye hiding ( distinctOn, distinctOnBy )-import qualified Opaleye.Internal.Order as Opaleye-import qualified Opaleye.Internal.QueryArr as Opaleye+import qualified Opaleye.Distinct as Opaleye+import qualified Opaleye.Order as Opaleye  -- rel8 import Rel8.Order ( Order( Order ) )@@ -33,13 +30,11 @@ -- to a projection. If multiple rows have the same projection, it is -- unspecified which row will be returned. If this matters, use 'distinctOnBy'. distinctOn :: EqTable b => (a -> b) -> Query a -> Query a-distinctOn proj =-  mapOpaleye (\q -> Opaleye.productQueryArr (Opaleye.distinctOn unpackspec proj . Opaleye.runSimpleQueryArr q))+distinctOn proj = mapOpaleye (Opaleye.distinctOnExplicit unpackspec proj)   -- | Select all distinct rows from a query, where rows are equivalent according -- to a projection. If there are multiple rows with the same projection, the -- first row according to the specified 'Order' will be returned. distinctOnBy :: EqTable b => (a -> b) -> Order a -> Query a -> Query a-distinctOnBy proj (Order order) =-  mapOpaleye (\q -> Opaleye.productQueryArr (Opaleye.distinctOnBy unpackspec proj order . Opaleye.runSimpleQueryArr q))+distinctOnBy proj (Order order) = mapOpaleye (Opaleye.distinctOnByExplicit unpackspec proj order)
src/Rel8/Query/Indexed.hs view
@@ -23,12 +23,12 @@  -- | Pair each row of a query with its index within the query. indexed :: Query a -> Query (Expr Int64, a)-indexed = mapOpaleye $ \(Opaleye.QueryArr f) -> Opaleye.QueryArr $ \(_, tag) ->+indexed = mapOpaleye $ \f -> Opaleye.stateQueryArr $ \_ tag ->   let-    (a, query, tag') = f ((), tag)+    (a, query, tag') = Opaleye.runStateQueryArr f () tag     tag'' = Opaleye.next tag'     window = Opaleye.ConstExpr $ Opaleye.OtherLit "ROW_NUMBER() OVER () - 1"     (index, bindings) = Opaleye.run $ Opaleye.extractAttr "index" tag' window-    query' lateral = Opaleye.Rebind True bindings . query lateral+    query' = query <> Opaleye.aRebind bindings   in     ((fromPrimExpr index, a), query', tag'')
src/Rel8/Query/Opaleye.hs view
@@ -41,30 +41,30 @@  unsafePeekQuery :: Query a -> a unsafePeekQuery (Query q) = case q mempty of-  Opaleye.QueryArr f -> case f ((), Opaleye.start) of+  f -> case Opaleye.runStateQueryArr f () Opaleye.start of     ((_, a), _, _) -> a   mapping :: ()   => (Opaleye.Select a -> Opaleye.Select b)   -> Opaleye.Select (m, a) -> Opaleye.Select (m, b)-mapping f q@(Opaleye.QueryArr qa) = Opaleye.QueryArr $ \(_, tag) ->+mapping f q = Opaleye.stateQueryArr $ \_ tag ->   let-    ((m, _), _, _) = qa ((), tag)-    Opaleye.QueryArr qa' = (m,) <$> f (snd <$> q)+    ((m, _), _, _) = Opaleye.runStateQueryArr q () tag+    q' = (m,) <$> f (snd <$> q)   in-    qa' ((), tag)+    Opaleye.runStateQueryArr q' () tag   zipping :: Semigroup m   => (Opaleye.Select a -> Opaleye.Select b -> Opaleye.Select c)   -> Opaleye.Select (m, a) -> Opaleye.Select (m, b) -> Opaleye.Select (m, c)-zipping f q@(Opaleye.QueryArr qa) q'@(Opaleye.QueryArr qa') =-  Opaleye.QueryArr $ \(_, tag) ->+zipping f q q' =+  Opaleye.stateQueryArr $ \_ tag ->     let-      ((m, _), _, _) = qa ((), tag)-      ((m', _), _, _) = qa' ((), tag)+      ((m, _), _, _) = Opaleye.runStateQueryArr q () tag+      ((m', _), _, _) = Opaleye.runStateQueryArr q' () tag       m'' = m <> m'-      Opaleye.QueryArr qa'' = (m'',) <$> f (snd <$> q) (snd <$> q')+      q'' = (m'',) <$> f (snd <$> q) (snd <$> q')     in-      qa'' ((), tag)+      Opaleye.runStateQueryArr q'' () tag
src/Rel8/Query/Rebind.hs view
@@ -7,29 +7,21 @@  -- base import Prelude+import Control.Arrow ((<<<))  -- opaleye-import qualified Opaleye.Internal.PackMap as Opaleye-import qualified Opaleye.Internal.PrimQuery as Opaleye-import qualified Opaleye.Internal.QueryArr as Opaleye-import qualified Opaleye.Internal.Tag as Opaleye-import qualified Opaleye.Internal.Unpackspec as Opaleye+import qualified Opaleye.Internal.Rebind as Opaleye  -- rel8 import Rel8.Expr ( Expr )-import Rel8.Query ( Query( Query ) )+import Rel8.Query ( Query ) import Rel8.Table ( Table ) import Rel8.Table.Opaleye ( unpackspec )+import Rel8.Query.Opaleye (fromOpaleye)   -- | 'rebind' takes a variable name, some expressions, and binds each of them -- to a new variable in the SQL. The @a@ returned consists only of these -- variables. It's essentially a @let@ binding for Postgres expressions. rebind :: Table Expr a => String -> a -> Query a-rebind prefix a = Query $ \_ -> Opaleye.QueryArr $ \(_, tag) ->-  let-    tag' = Opaleye.next tag-    (a', bindings) = Opaleye.run $-      Opaleye.runUnpackspec unpackspec (Opaleye.extractAttr prefix tag) a-  in-    ((mempty, a'), \_ -> Opaleye.Rebind True bindings, tag')+rebind prefix a = fromOpaleye (Opaleye.rebindExplicitPrefix prefix unpackspec <<< pure a)
src/Rel8/Query/These.hs view
@@ -48,11 +48,11 @@ alignBy :: ()   => (a -> b -> Expr Bool)   -> Query a -> Query b -> Query (TheseTable Expr a b)-alignBy condition = zipOpaleyeWith $ \left right -> Opaleye.QueryArr $ \i -> case i of-  (_, tag) -> (tab, join', tag''')+alignBy condition = zipOpaleyeWith $ \left right -> Opaleye.stateQueryArr $ \_ t -> case t of+  tag -> (tab, join', tag''')     where-      (ma, left', tag') = Opaleye.runSimpleQueryArr (pure <$> left) ((), tag)-      (mb, right', tag'') = Opaleye.runSimpleQueryArr (pure <$> right) ((), tag')+      (ma, left', tag') = Opaleye.runStateQueryArr (pure <$> left) () tag+      (mb, right', tag'') = Opaleye.runStateQueryArr (pure <$> right) () tag'       MaybeTable hasHere a = ma       MaybeTable hasThere b = mb       (hasHere', lbindings) = Opaleye.run $ do@@ -60,15 +60,15 @@       (hasThere', rbindings) = Opaleye.run $ do         traversePrimExpr (Opaleye.extractAttr "hasThere" tag'') hasThere       tag''' = Opaleye.next tag''-      join lateral = Opaleye.Join Opaleye.FullJoin on left'' right''+      join = Opaleye.Join Opaleye.FullJoin on left'' right''         where           on = toPrimExpr $ condition (extract a) (extract b)-          left'' = (lateral, Opaleye.Rebind True lbindings left')-          right'' = (lateral, Opaleye.Rebind True rbindings right')+          left'' = (Opaleye.NonLateral, Opaleye.toPrimQuery (left' <> Opaleye.aRebind lbindings))+          right'' = (Opaleye.NonLateral, Opaleye.toPrimQuery (right' <> Opaleye.aRebind rbindings))       ma' = MaybeTable hasHere' a       mb' = MaybeTable hasThere' b       tab = TheseTable {here = ma', there = mb'}-      join' lateral input = Opaleye.times lateral input (join lateral)+      join' = Opaleye.aProduct join   keepHereTable :: TheseTable Expr a b -> Query (a, MaybeTable Expr b)
− src/Rel8/Schema/Name.hs-boot 
@@ -1,11 +0,0 @@-{-# language PolyKinds #-}-{-# language RoleAnnotations #-}-{-# language StandaloneKindSignatures #-}--module Rel8.Schema.Name where--import Data.Kind ( Type )--type Name :: k -> Type-type role Name nominal-data Name a
src/Rel8/Tabulate.hs view
@@ -69,9 +69,7 @@  -- opaleye import qualified Opaleye.Aggregate as Opaleye-import qualified Opaleye.Internal.Order as Opaleye-import qualified Opaleye.Internal.QueryArr as Opaleye-import qualified Opaleye.Order as Opaleye ( orderBy )+import qualified Opaleye.Order as Opaleye ( orderBy, distinctOnExplicit )  -- profunctors import Data.Profunctor ( dimap, lmap )@@ -350,14 +348,7 @@   case fst (unsafePeekQuery (f p)) of     Nothing -> limit 1 (f p)     Just _ ->-      mapOpaleye-        (\q ->-          Opaleye.productQueryArr-            ( Opaleye.distinctOn (key unpackspec) fst-            . Opaleye.runSimpleQueryArr q-            )-        )-        (f p)+      mapOpaleye (Opaleye.distinctOnExplicit (key unpackspec) fst) (f p)   -- | 'order' orders the /values/ of a 'Tabulation' within their