on master help sign in
Merge pull request #90 from jappeace/add-pool-3-support

Add support for resource-pool 3

commitf6c7bbbcdb383d2eb487ad7fe427ec05a747c14f authorIsaac van Bakel <isaac@supercede.com> dateFri 14 Oct 2022, 10:32 (4 years ago) parentdce96c079f2c9f
2 files changed+7−2
odd-jobs.cabal+1−1 src/OddJobs/Job.hs+6−1
odd-jobs.cabal+1−1
@@ -81,7 +81,7 @@ library
8181 , mtl
8282 , optparse-applicative
8383 , postgresql-simple
84− , resource-pool
84+ , resource-pool >= 0.2.0.0 && < 0.4.0.0
8585 , safe
8686 , servant
8787 , servant-lucid
src/OddJobs/Job.hs+6−1
@@ -75,7 +75,8 @@ module OddJobs.Job
7575where
7676
7777import OddJobs.Types
78−import Data.Pool
78+import qualified Data.Pool as Pool
79+import Data.Pool(Pool)
7980import Data.Text as T
8081import Database.PostgreSQL.Simple as PGS
8182import Database.PostgreSQL.Simple.Notification
@@ -255,6 +256,10 @@ concatJobDbColumns = concatJobDbColumns_ jobDbColumns ""
255256findJobByIdQuery :: PGS.Query
256257findJobByIdQuery = "SELECT " <> concatJobDbColumns <> " FROM ? WHERE id = ?"
257258
259+withResource :: MonadUnliftIO m => Pool a -> (a -> m b) -> m b
260+withResource pool fa =
261+ withRunInIO $ \runInIO -> Pool.withResource pool (runInIO . fa)
262+
258263withDbConnection :: (HasJobRunner m)
259264 => (Connection -> m a)
260265 -> m a