haskell/esqueleto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #55 from mindreader/master

Browse Source 
Conduit no longer exports resourcet related functions.
This commit is contained in:
Felipe Lessa 2014-04-02 13:24:43 -03:00
commit 3abcbb72cf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Database/Esqueleto/Internal/Sql.hs
View File

@ -51,7 +51,7 @@ import Control.Monad ((>=>), ap, void, MonadPlus(..))
import Control.Monad.IO.Class (MonadIO(..)) import Control.Monad.IO.Class (MonadIO(..))
import Control.Monad.Logger (MonadLogger) import Control.Monad.Logger (MonadLogger)
import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.Class (lift)
import Control.Monad.Trans.Resource (MonadResourceBase) import Control.Monad.Trans.Resource (runResourceT, ResourceT, MonadResourceBase)
import Data.Int (Int64) import Data.Int (Int64)
import Data.List (intersperse) import Data.List (intersperse)
import Data.Monoid (Monoid(..), (<>)) import Data.Monoid (Monoid(..), (<>))
@ -543,7 +543,7 @@ rawSelectSource :: ( SqlSelect a r
, MonadResourceBase m ) , MonadResourceBase m )
=> Mode => Mode
-> SqlQuery a -> SqlQuery a
-> SqlPersistT m (C.Source (C.ResourceT (SqlPersistT m)) r) -> SqlPersistT m (C.Source (ResourceT (SqlPersistT m)) r)
rawSelectSource mode query = src rawSelectSource mode query = src
where where
src = do src = do
@ -571,7 +571,7 @@ selectSource :: ( SqlSelect a r
, MonadLogger m , MonadLogger m
, MonadResourceBase m ) , MonadResourceBase m )
=> SqlQuery a => SqlQuery a
-> SqlPersistT m (C.Source (C.ResourceT (SqlPersistT m)) r) -> SqlPersistT m (C.Source (ResourceT (SqlPersistT m)) r)
selectSource = rawSelectSource SELECT selectSource = rawSelectSource SELECT
@ -631,7 +631,7 @@ selectDistinctSource
, MonadLogger m , MonadLogger m
, MonadResourceBase m ) , MonadResourceBase m )
=> SqlQuery a => SqlQuery a
-> SqlPersistT m (C.Source (C.ResourceT (SqlPersistT m)) r) -> SqlPersistT m (C.Source (ResourceT (SqlPersistT m)) r)
selectDistinctSource = rawSelectSource SELECT_DISTINCT selectDistinctSource = rawSelectSource SELECT_DISTINCT
@ -646,9 +646,9 @@ selectDistinct = selectDistinctSource >=> runSource
-- | (Internal) Run a 'C.Source' of rows. -- | (Internal) Run a 'C.Source' of rows.
runSource :: MonadResourceBase m => runSource :: MonadResourceBase m =>
C.Source (C.ResourceT (SqlPersistT m)) r C.Source (ResourceT (SqlPersistT m)) r
-> SqlPersistT m [r] -> SqlPersistT m [r]
runSource src = C.runResourceT $ src C.$$ CL.consume runSource src = runResourceT $ src C.$$ CL.consume
---------------------------------------------------------------------- ----------------------------------------------------------------------