diff --git a/esqueleto.cabal b/esqueleto.cabal index feb65c9..5d350c7 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -53,7 +53,7 @@ library , conduit >=1.3 , containers , monad-logger - , persistent >=2.12 && <2.13 + , persistent >=2.13 && <3 , resourcet >=1.2 , tagged >=0.2 , text >=0.11 && <1.3 @@ -154,7 +154,7 @@ test-suite sqlite Paths_esqueleto hs-source-dirs: test - ghc-options: -Wall + ghc-options: -Wall -O2 +RTS -m5m -RTS build-depends: base >=4.8 && <5.0 , attoparsec diff --git a/test/SQLite/Test.hs b/test/SQLite/Test.hs index 0413a20..5eb198a 100644 --- a/test/SQLite/Test.hs +++ b/test/SQLite/Test.hs @@ -161,10 +161,6 @@ testSqliteTextFunctions = do nameContains like "i" [p4e, p3e] nameContains like "iv" [p4e] - - - - main :: IO () main = do hspec $ do @@ -173,7 +169,7 @@ main = do describe "Test SQLite locking" $ do testLocking withConn - describe "SQLite specific tests" $ do + fdescribe "SQLite specific tests" $ do testAscRandom random_ run testRandomMath run testSqliteRandom @@ -184,10 +180,6 @@ main = do testSqliteUpdate testSqliteTextFunctions - - - - run, runSilent, runVerbose :: Run runSilent act = runNoLoggingT $ run_worker act runVerbose act = runStderrLoggingT $ run_worker act @@ -196,20 +188,16 @@ run = then runVerbose else runSilent - verbose :: Bool verbose = False - run_worker :: RunDbMonad m => SqlPersistT (R.ResourceT m) a -> m a run_worker act = withConn $ runSqlConn (migrateIt >> act) - migrateIt :: RunDbMonad m => SqlPersistT (R.ResourceT m) () migrateIt = do void $ runMigrationSilent migrateAll - withConn :: RunDbMonad m => (SqlBackend -> R.ResourceT m a) -> m a withConn = R.runResourceT . withSqliteConn ":memory:"