hasql-transaction 0.7 → 0.7.1
raw patch · 3 files changed
+105/−67 lines, 3 filesdep −base-preludedep ~basePVP ok
version bump matches the API change (PVP)
Dependencies removed: base-prelude
Dependency ranges changed: base
API changes (from Hackage documentation)
Files
- hasql-transaction.cabal +33/−65
- library/Hasql/Transaction/Private/Prelude.hs +65/−2
- library/Hasql/Transaction/Private/Transaction.hs +7/−0
hasql-transaction.cabal view
@@ -1,46 +1,25 @@-name:- hasql-transaction-version:- 0.7-category:- Hasql, Database, PostgreSQL-synopsis:- A composable abstraction over the retryable transactions for Hasql-homepage:- https://github.com/nikita-volkov/hasql-transaction -bug-reports:- https://github.com/nikita-volkov/hasql-transaction/issues -author:- Nikita Volkov <nikita.y.volkov@mail.ru>-maintainer:- Nikita Volkov <nikita.y.volkov@mail.ru>-copyright:- (c) 2015, Nikita Volkov-license:- MIT-license-file:- LICENSE-build-type:- Simple-cabal-version:- >=1.10-+name: hasql-transaction+version: 0.7.1+category: Hasql, Database, PostgreSQL+synopsis: A composable abstraction over the retryable transactions for Hasql+homepage: https://github.com/nikita-volkov/hasql-transaction+bug-reports: https://github.com/nikita-volkov/hasql-transaction/issues+author: Nikita Volkov <nikita.y.volkov@mail.ru>+maintainer: Nikita Volkov <nikita.y.volkov@mail.ru>+copyright: (c) 2015, Nikita Volkov+license: MIT+license-file: LICENSE+build-type: Simple+cabal-version: >=1.10 source-repository head- type:- git- location:- git://github.com/nikita-volkov/hasql-transaction.git-+ type: git+ location: git://github.com/nikita-volkov/hasql-transaction.git library- hs-source-dirs:- library- ghc-options:- default-extensions:- Arrows, BangPatterns, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, PatternGuards, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell, TupleSections, TypeFamilies, TypeOperators, UnboxedTuples- default-language:- Haskell2010+ hs-source-dirs: library+ default-extensions: Arrows, BangPatterns, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, PatternGuards, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell, TupleSections, TypeFamilies, TypeOperators, UnboxedTuples+ default-language: Haskell2010 other-modules: Hasql.Transaction.Private.Prelude Hasql.Transaction.Private.Model@@ -52,28 +31,21 @@ Hasql.Transaction Hasql.Transaction.Sessions build-depends:- -- database:- hasql >= 1.3 && < 1.4,- -- data:- bytestring-tree-builder >= 0.1 && < 0.3,- bytestring >= 0.10 && < 0.11,- -- control:- contravariant >= 1.3 && < 2,- contravariant-extras >= 0.3 && < 0.4,- mtl >= 2 && < 3,- transformers >= 0.3 && < 0.6,- -- general:- base-prelude >= 0.1.19 && < 2,- base >= 4.6 && < 5-+ base >=4.9 && <5,+ bytestring >=0.10 && <0.11,+ bytestring-tree-builder >=0.1 && <0.3,+ contravariant >=1.3 && <2,+ contravariant-extras >=0.3 && <0.4,+ hasql >=1.3 && <1.4,+ mtl >=2 && <3,+ transformers >=0.3 && <0.6 test-suite conflicts-test- type:- exitcode-stdio-1.0- hs-source-dirs:- conflicts-test- main-is:- Main.hs+ type: exitcode-stdio-1.0+ hs-source-dirs: conflicts-test+ default-extensions: Arrows, BangPatterns, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, PatternGuards, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell, TupleSections, TypeFamilies, TypeOperators, UnboxedTuples+ default-language: Haskell2010+ main-is: Main.hs other-modules: Main.Statements Main.Transactions@@ -81,12 +53,8 @@ -O2 -threaded "-with-rtsopts=-N"- default-extensions:- Arrows, BangPatterns, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, PatternGuards, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell, TupleSections, TypeFamilies, TypeOperators, UnboxedTuples- default-language:- Haskell2010 build-depends: hasql-transaction, hasql,- async >= 2.1 && < 3,- rebase < 2+ async >=2.1 && <3,+ rebase <2
library/Hasql/Transaction/Private/Prelude.hs view
@@ -6,9 +6,72 @@ where --- base-prelude+-- base --------------------------import BasePrelude as Exports hiding (assert, left, right, isLeft, isRight, error)+import Control.Applicative as Exports+import Control.Arrow as Exports+import Control.Category as Exports+import Control.Concurrent as Exports+import Control.Exception as Exports+import Control.Monad as Exports hiding (join, fail, mapM_, sequence_, forM_, msum, mapM, sequence, forM)+import Control.Monad.IO.Class as Exports+import Control.Monad.Fail as Exports+import Control.Monad.Fix as Exports hiding (fix)+import Control.Monad.ST as Exports+import Data.Bits as Exports+import Data.Bool as Exports+import Data.Char as Exports+import Data.Coerce as Exports+import Data.Complex as Exports+import Data.Data as Exports+import Data.Dynamic as Exports+import Data.Either as Exports+import Data.Fixed as Exports+import Data.Foldable as Exports hiding (toList)+import Data.Function as Exports hiding (id, (.))+import Data.Functor as Exports+import Data.Functor.Identity as Exports+import Data.Int as Exports+import Data.IORef as Exports+import Data.Ix as Exports+import Data.List as Exports hiding (sortOn, isSubsequenceOf, uncons, concat, foldr, foldl1, maximum, minimum, product, sum, all, and, any, concatMap, elem, foldl, foldr1, notElem, or, find, maximumBy, minimumBy, mapAccumL, mapAccumR, foldl')+import Data.Maybe as Exports+import Data.Monoid as Exports hiding (Last(..), First(..), (<>), Alt)+import Data.Ord as Exports+import Data.Proxy as Exports+import Data.Ratio as Exports+import Data.Semigroup as Exports+import Data.STRef as Exports+import Data.String as Exports+import Data.Traversable as Exports+import Data.Tuple as Exports+import Data.Unique as Exports+import Data.Version as Exports+import Data.Word as Exports+import Debug.Trace as Exports+import Foreign.ForeignPtr as Exports+import Foreign.Ptr as Exports+import Foreign.StablePtr as Exports+import Foreign.Storable as Exports hiding (sizeOf, alignment)+import GHC.Conc as Exports hiding (withMVar, threadWaitWriteSTM, threadWaitWrite, threadWaitReadSTM, threadWaitRead)+import GHC.Exts as Exports (lazy, inline, sortWith, groupWith, IsList(..))+import GHC.Generics as Exports (Generic, Generic1)+import GHC.IO.Exception as Exports+import Numeric as Exports+import Prelude as Exports hiding (fail, concat, foldr, mapM_, sequence_, foldl1, maximum, minimum, product, sum, all, and, any, concatMap, elem, foldl, foldr1, notElem, or, mapM, sequence, id, (.))+import System.Environment as Exports+import System.Exit as Exports+import System.IO as Exports+import System.IO.Error as Exports+import System.IO.Unsafe as Exports+import System.Mem as Exports+import System.Mem.StableName as Exports+import System.Timeout as Exports+import Text.ParserCombinators.ReadP as Exports (ReadP, ReadS, readP_to_S, readS_to_P)+import Text.ParserCombinators.ReadPrec as Exports (ReadPrec, readPrec_to_P, readP_to_Prec, readPrec_to_S, readS_to_Prec)+import Text.Printf as Exports (printf, hPrintf)+import Text.Read as Exports (Read(..), readMaybe, readEither)+import Unsafe.Coerce as Exports -- transformers -------------------------
library/Hasql/Transaction/Private/Transaction.hs view
@@ -19,6 +19,13 @@ Transaction (StateT Bool B.Session a) deriving (Functor, Applicative, Monad) +instance Semigroup a => Semigroup (Transaction a) where+ (<>) = liftA2 (<>)++instance Monoid a => Monoid (Transaction a) where+ mempty = pure mempty+ mappend = liftA2 mappend+ -- | -- Execute the transaction using the provided isolation level and mode. {-# INLINE run #-}