diff --git a/esqueleto.cabal b/esqueleto.cabal index 9602f8c..c3f9037 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -1,5 +1,5 @@ name: esqueleto -version: 2.1.2.2 +version: 2.1.2.3 synopsis: Type-safe EDSL for SQL queries on persistent backends. homepage: https://github.com/prowdsponsor/esqueleto license: BSD3 @@ -64,9 +64,9 @@ library other-modules: Database.Esqueleto.Internal.PersistentImport build-depends: - base >= 4.5 && < 4.8 - , text >= 0.11 && < 1.3 - , persistent >= 2.1.1.3 && < 2.2 + base >= 4.5 && < 4.9 + , text >= 0.11 && < 1.3 + , persistent >= 2.1 && < 2.2 , transformers >= 0.2 , unordered-containers >= 0.2 , tagged >= 0.2 diff --git a/test/Test.hs b/test/Test.hs index b6b1e4b..09b862d 100644 --- a/test/Test.hs +++ b/test/Test.hs @@ -36,6 +36,9 @@ import Database.Persist.MySQL ( withMySQLConn , defaultConnectInfo) #else import Database.Persist.Sqlite (withSqliteConn) +#if MIN_VERSION_persistent_sqlite(2,1,3) +import Database.Sqlite (SqliteException) +#endif #endif import Database.Persist.TH import Test.Hspec @@ -748,7 +751,11 @@ main = do run (select $ from $ \p -> do return (coalesce [p ^. PersonAge]) :: SqlQuery (SqlExpr (Value (Maybe Int))) +#if MIN_VERSION_persistent_sqlite(2,1,3) + ) `shouldThrow` (\(_ :: SqliteException) -> True) +#else ) `shouldThrow` (\(_ :: IOException) -> True) +#endif #endif describe "text functions" $