Fix some warnings about the test suite.

This commit is contained in:
Felipe Lessa 2012-09-04 18:15:09 -03:00
parent 31b4b0669f
commit e35b4a1b21

View File

@ -8,7 +8,7 @@ import Control.Monad.IO.Class (MonadIO(liftIO))
import Control.Monad.Logger (MonadLogger(..), LogLevel(..)) import Control.Monad.Logger (MonadLogger(..), LogLevel(..))
import Control.Monad.Trans.Control (MonadBaseControl(..)) import Control.Monad.Trans.Control (MonadBaseControl(..))
import Database.Esqueleto import Database.Esqueleto
import Database.Persist.Sqlite (runSqlConn, withSqliteConn) import Database.Persist.Sqlite (withSqliteConn)
import Database.Persist.TH import Database.Persist.TH
import Language.Haskell.TH (Loc(..)) import Language.Haskell.TH (Loc(..))
import System.IO (stderr) import System.IO (stderr)
@ -97,11 +97,11 @@ main = do
it "works for a simple projection with a simple self-join" $ it "works for a simple projection with a simple self-join" $
run $ do run $ do
p1k <- insert p1 _ <- insert p1
p2k <- insert p2 _ <- insert p2
ret <- select $ ret <- select $
from $ \(p1, p2) -> from $ \(pa, pb) ->
return (p1 ^. PersonName, p2 ^. PersonName) return (pa ^. PersonName, pb ^. PersonName)
liftIO $ ret `shouldBe` [ (Single (personName p1), Single (personName p1)) liftIO $ ret `shouldBe` [ (Single (personName p1), Single (personName p1))
, (Single (personName p1), Single (personName p2)) , (Single (personName p1), Single (personName p2))
, (Single (personName p2), Single (personName p1)) , (Single (personName p2), Single (personName p1))
@ -219,8 +219,13 @@ run, runSilent, runVerbose :: (forall m. RunDbMonad m => SqlPersist (C.ResourceT
runSilent act = run_worker act runSilent act = run_worker act
runVerbose act = execVerbose $ run_worker act runVerbose act = execVerbose $ run_worker act
run = run =
runSilent if verbose
-- runVerbose then runVerbose
else runSilent
verbose :: Bool
verbose = True
run_worker :: RunDbMonad m => SqlPersist (C.ResourceT m) a -> m a run_worker :: RunDbMonad m => SqlPersist (C.ResourceT m) a -> m a