Merge pull request #4 from helium/revert-3-feature/monad-base-control-instance

Revert "Implement instance of MonadBaseControl"

Author: patrickt

postgresql-transactional.cabal

@@ -20,9 +20,7 @@ library
   ghc-options: -Wall -Werror
   -- other-extensions:
   build-depends:       base >= 4 && < 5
-                     , monad-control >= 1.0
-                     , mtl
                      , postgresql-simple >= 0.4
-                     , transformers-base
+                     , mtl
   -- hs-source-dirs:
   default-language:    Haskell2010

src/Database/PostgreSQL/TransactionalStore.hs

@@ -2,7 +2,6 @@
 {-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE MultiParamTypeClasses      #-}
-{-# LANGUAGE TypeFamilies #-}
 
 module Database.PostgreSQL.TransactionalStore
     ( PGTransaction
@@ -20,29 +19,21 @@ module Database.PostgreSQL.TransactionalStore
 #if __GLASGOW_HASKELL__ < 710
 import           Control.Applicative
 #endif
-import           Control.Monad.Base                 (MonadBase)
-import           Control.Monad.Trans.Control        (MonadBaseControl(..))
 import           Control.Monad.Reader
 import           Data.Int
 import qualified Database.PostgreSQL.Simple         as Postgres
 import           Database.PostgreSQL.Simple.FromRow
 import           Database.PostgreSQL.Simple.ToRow
 
 newtype PGTransaction a =
-    PGTransaction { unPGTransaction :: ReaderT Postgres.Connection IO a }
+    PGTransaction (ReaderT Postgres.Connection IO a)
     deriving ( Functor
              , Applicative
              , Monad
              , MonadIO
              , MonadReader Postgres.Connection
-             , MonadBase IO
              )
 
-instance MonadBaseControl IO PGTransaction where
-  type StM PGTransaction a = a
-  liftBaseWith f = PGTransaction $ liftBaseWith $ \q -> f (q . unPGTransaction)
-  restoreM = PGTransaction . restoreM
-
 runPGTransaction :: MonadIO m => PGTransaction a -> Postgres.Connection -> m a
 runPGTransaction (PGTransaction pgTrans) conn =
     liftIO (Postgres.withTransaction conn (runReaderT pgTrans conn))