diff --git a/selda/src/Database/Selda/Backend/Internal.hs b/selda/src/Database/Selda/Backend/Internal.hs index b52fafa..04d4ea5 100644 --- a/selda/src/Database/Selda/Backend/Internal.hs +++ b/selda/src/Database/Selda/Backend/Internal.hs @@ -40,11 +40,12 @@ import Database.Selda.SQL.Print.Config import Database.Selda.Types (TableName, ColName) import Data.Int (Int64) import Control.Concurrent ( newMVar, putMVar, takeMVar, MVar ) +import Control.Monad ( when ) import Control.Monad.Catch ( Exception, bracket, MonadCatch, MonadMask, MonadThrow(..) ) import Control.Monad.IO.Class ( MonadIO(..) ) import Control.Monad.Reader - ( MonadTrans(..), when, ReaderT(..), MonadReader(ask) ) + ( MonadTrans(..), ReaderT(..), MonadReader(ask) ) import Data.Dynamic ( Typeable, Dynamic ) import qualified Data.IntMap as M import Data.IORef diff --git a/selda/src/Database/Selda/Generic.hs b/selda/src/Database/Selda/Generic.hs index 9c18423..d0038b8 100644 --- a/selda/src/Database/Selda/Generic.hs +++ b/selda/src/Database/Selda/Generic.hs @@ -8,8 +8,9 @@ module Database.Selda.Generic ( Relational, Generic , tblCols, params, def, gNew, gRow ) where +import Control.Monad ( liftM2 ) import Control.Monad.State - ( liftM2, MonadState(put, get), evalState, State ) + ( MonadState(put, get), evalState, State ) import Data.Dynamic ( Typeable ) import Data.Text as Text (Text, pack) diff --git a/selda/src/Database/Selda/SQL/Print.hs b/selda/src/Database/Selda/SQL/Print.hs index cae9192..1263e41 100644 --- a/selda/src/Database/Selda/SQL/Print.hs +++ b/selda/src/Database/Selda/SQL/Print.hs @@ -16,8 +16,9 @@ import qualified Database.Selda.SQL.Print.Config as Cfg import Database.Selda.SqlType ( Lit(LJust, LNull), SqlTypeRep ) import Database.Selda.Types ( TableName, ColName, fromColName, fromTableName ) +import Control.Monad ( liftM2 ) import Control.Monad.State - ( liftM2, MonadState(get, put), runState, State ) + ( MonadState(get, put), runState, State ) import Data.List ( group, sort ) import Data.Text (Text) import qualified Data.Text as Text diff --git a/selda/src/Database/Selda/SqlRow.hs b/selda/src/Database/Selda/SqlRow.hs index 4a52633..bd21d72 100644 --- a/selda/src/Database/Selda/SqlRow.hs +++ b/selda/src/Database/Selda/SqlRow.hs @@ -7,9 +7,9 @@ module Database.Selda.SqlRow , GSqlRow , runResultReader, next ) where +import Control.Monad ( liftM2 ) import Control.Monad.State.Strict - ( liftM2, - StateT(StateT), + ( StateT(StateT), MonadState(state, get), State, evalState ) diff --git a/selda/src/Database/Selda/Unsafe.hs b/selda/src/Database/Selda/Unsafe.hs index 641674a..143249e 100644 --- a/selda/src/Database/Selda/Unsafe.hs +++ b/selda/src/Database/Selda/Unsafe.hs @@ -9,8 +9,9 @@ module Database.Selda.Unsafe , QueryFragment, inj, injLit, rawName, rawExp, rawStm, rawQuery, rawQuery1 ) where import Control.Exception (throw) +import Control.Monad ( void ) import Control.Monad.State.Strict - ( MonadIO(liftIO), void, MonadState(put, get) ) + ( MonadIO(liftIO), MonadState(put, get) ) import Database.Selda.Backend.Internal ( SqlType(mkLit, sqlType), MonadSelda,