From 25e12579ddd083d33b8072ffc96d283e6bec695a Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Sat, 24 Jun 2023 23:23:54 +0200 Subject: [PATCH] Compatibility with newer persistent --- src/Stackage/Database/Schema.hs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Stackage/Database/Schema.hs b/src/Stackage/Database/Schema.hs index f915984..0e45bab 100644 --- a/src/Stackage/Database/Schema.hs +++ b/src/Stackage/Database/Schema.hs @@ -1,4 +1,5 @@ {-# LANGUAGE CPP #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} @@ -46,7 +47,12 @@ module Stackage.Database.Schema , module PS ) where -import Control.Monad.Logger (runNoLoggingT, runStdoutLoggingT, MonadLogger) +import Control.Monad.Logger (runNoLoggingT, runStdoutLoggingT) +#if MIN_VERSION_monad_logger(0,3,10) && MIN_VERSION_persistent_postgresql(2,12,0) +import Control.Monad.Logger (MonadLoggerIO) +#else +import Control.Monad.Logger (MonadLogger) +#endif import qualified Data.Aeson as A import Data.Pool (destroyAllResources, Pool) import Database.Persist @@ -186,7 +192,12 @@ run inner = do withStackageDatabase :: MonadUnliftIO m => Bool -> DatabaseSettings -> (StackageDatabase -> m a) -> m a withStackageDatabase shouldLog dbs inner = do - let makePool :: (MonadUnliftIO m, MonadLogger m) => m (Pool SqlBackend) + let +#if MIN_VERSION_monad_logger(0,3,10) && MIN_VERSION_persistent_postgresql(2,12,0) + makePool :: (MonadUnliftIO m, MonadLoggerIO m) => m (Pool SqlBackend) +#else + makePool :: (MonadUnliftIO m, MonadLogger m) => m (Pool SqlBackend) +#endif makePool = case dbs of DSPostgres connStr mSize -> do