Remove pool-conduit dep from persistent

persistent/Database/Persist/Sql.hs

@@ -21,7 +21,7 @@ module Database.Persist.Sql
 import Database.Persist
 import Database.Persist.Sql.Types
 import Database.Persist.Sql.Class
-import Database.Persist.Sql.Run
+import Database.Persist.Sql.Run hiding (withResourceTimeout)
 import Database.Persist.Sql.Raw
 import Database.Persist.Sql.Migration
 import Database.Persist.Sql.Internal

persistent/Database/Persist/Sql/Run.hs

@@ -3,17 +3,21 @@ module Database.Persist.Sql.Run where
 
 import Database.Persist.Sql.Types
 import Database.Persist.Sql.Raw
-import Data.Conduit.Pool
+import Data.Pool as P
 import Control.Monad.Trans.Reader
 import Control.Monad.Trans.Resource
 import Control.Monad.Logger
 import Control.Monad.Base
 import Control.Exception.Lifted (onException)
 import Control.Monad.IO.Class
 import Control.Exception.Lifted (bracket)
+import Control.Exception (mask)
+import System.Timeout (timeout)
+import Control.Monad.Trans.Control (control)
 import Data.IORef (readIORef)
 import qualified Data.Map as Map
 import Control.Exception.Lifted (throwIO)
+import Control.Monad (liftM)
 
 -- | Get a connection from the pool, run the given action, and then return the
 -- connection to the pool.
@@ -22,6 +26,24 @@ runSqlPool r pconn = do
     mres <- withResourceTimeout 2000000 pconn $ runSqlConn r
     maybe (throwIO Couldn'tGetSQLConnection) return mres
 
+withResourceTimeout
+  :: (MonadBaseControl IO m)
+  => Int -- ^ Timeout period in microseconds
+  -> P.Pool a
+  -> (a -> m b)
+  -> m (Maybe b)
+{-# SPECIALIZE withResourceTimeout :: Int -> P.Pool a -> (a -> IO b) -> IO (Maybe b) #-}
+withResourceTimeout ms pool act = control $ \runInIO -> mask $ \restore -> do
+    mres <- timeout ms $ P.takeResource pool
+    case mres of
+        Nothing -> runInIO $ return Nothing
+        Just (resource, local) -> do
+            ret <- restore (runInIO (liftM Just $ act resource)) `onException`
+                    P.destroyResource pool local resource
+            P.putResource local resource
+            return ret
+{-# INLINABLE withResourceTimeout #-}
+
 runSqlConn :: MonadBaseControl IO m => SqlPersistT m a -> Connection -> m a
 runSqlConn (SqlPersistT r) conn = do
     let getter = getStmtConn conn

persistent/Database/Persist/Sql/Types.hs

@@ -28,7 +28,7 @@ import Data.IORef (IORef)
 import Data.Map (Map)
 import Data.Int (Int64)
 import Data.Conduit (Source)
-import Data.Conduit.Pool (Pool)
+import Data.Pool (Pool)
 import Web.PathPieces
 import Control.Exception (throw)
 import qualified Data.Text.Read

persistent/persistent.cabal

@@ -1,5 +1,5 @@
 name:            persistent
-version:         1.3.0.3
+version:         1.3.0.4
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <[email protected]>
@@ -31,7 +31,6 @@ library
                    , resourcet                >= 0.4
                    , monad-control            >= 0.3
                    , lifted-base              >= 0.1
-                   , pool-conduit             >= 0.1.2
                    , path-pieces              >= 0.1
                    , aeson                    >= 0.5
                    , monad-logger             >= 0.3
@@ -45,6 +44,7 @@ library
                    , blaze-markup             >= 0.5.1
                    , silently
                    , scientific
+                   , resource-pool
 
     exposed-modules: Database.Persist
                      Database.Persist.Quasi