From 69a4ec0c4466acea43f5e7a742231990a66232ae Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 29 Mar 2015 08:29:49 +0300 Subject: [PATCH 1/3] Fix test suite for new SqliteException Sorry for the breakage @meteficha, and hope you don't mind that I'm deploying this to Hackage. --- esqueleto.cabal | 2 +- test/Test.hs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/esqueleto.cabal b/esqueleto.cabal index 307c486..af54e38 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -1,5 +1,5 @@ name: esqueleto -version: 2.1.2.1 +version: 2.1.2.2 synopsis: Type-safe EDSL for SQL queries on persistent backends. homepage: https://github.com/prowdsponsor/esqueleto license: BSD3 diff --git a/test/Test.hs b/test/Test.hs index ce9cecf..92cf95e 100644 --- a/test/Test.hs +++ b/test/Test.hs @@ -34,6 +34,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 @@ -604,7 +607,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" $ From 41d4cb283af97c9bd60bb3aacb60eef07f844fcf Mon Sep 17 00:00:00 2001 From: Felipe Lessa Date: Mon, 6 Apr 2015 23:37:48 -0300 Subject: [PATCH 2/3] GHC 7.10. --- esqueleto.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esqueleto.cabal b/esqueleto.cabal index af54e38..1bd8724 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -64,7 +64,7 @@ library other-modules: Database.Esqueleto.Internal.PersistentImport build-depends: - base >= 4.5 && < 4.8 + base >= 4.5 && < 4.9 , text >= 0.11 && < 1.3 , persistent >= 2.1 && < 2.2 , transformers >= 0.2 From 8b67bf9640625fe1a66fb203add385751375eada Mon Sep 17 00:00:00 2001 From: Felipe Lessa Date: Mon, 6 Apr 2015 23:43:58 -0300 Subject: [PATCH 3/3] Bump version to 2.1.2.3. --- esqueleto.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esqueleto.cabal b/esqueleto.cabal index 1bd8724..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