haskell/esqueleto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prowdsponsor/esqueleto

Browse Source 
Conflicts:
	esqueleto.cabal
This commit is contained in:
Alberto Valverde 2015-04-01 16:32:26 +02:00
commit 12a2d2de2b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
esqueleto.cabal
View File

@ -1,5 +1,5 @@
name: esqueleto name: esqueleto
version: 2.1.2.2 version: 2.1.2.3
synopsis: Type-safe EDSL for SQL queries on persistent backends. synopsis: Type-safe EDSL for SQL queries on persistent backends.
homepage: https://github.com/prowdsponsor/esqueleto homepage: https://github.com/prowdsponsor/esqueleto
license: BSD3 license: BSD3
@ -64,9 +64,9 @@ library
other-modules: other-modules:
Database.Esqueleto.Internal.PersistentImport Database.Esqueleto.Internal.PersistentImport
build-depends: build-depends:
base >= 4.5 && < 4.8 base >= 4.5 && < 4.9
, text >= 0.11 && < 1.3 , text >= 0.11 && < 1.3
, persistent >= 2.1.1.3 && < 2.2 , persistent >= 2.1 && < 2.2
, transformers >= 0.2 , transformers >= 0.2
, unordered-containers >= 0.2 , unordered-containers >= 0.2
, tagged >= 0.2 , tagged >= 0.2

7
test/Test.hs
View File

@ -36,6 +36,9 @@ import Database.Persist.MySQL ( withMySQLConn
, defaultConnectInfo) , defaultConnectInfo)
#else #else
import Database.Persist.Sqlite (withSqliteConn) import Database.Persist.Sqlite (withSqliteConn)
#if MIN_VERSION_persistent_sqlite(2,1,3)
import Database.Sqlite (SqliteException)
#endif
#endif #endif
import Database.Persist.TH import Database.Persist.TH
import Test.Hspec import Test.Hspec
@ -748,7 +751,11 @@ main = do
run (select $ run (select $
from $ \p -> do from $ \p -> do
return (coalesce [p ^. PersonAge]) :: SqlQuery (SqlExpr (Value (Maybe Int))) return (coalesce [p ^. PersonAge]) :: SqlQuery (SqlExpr (Value (Maybe Int)))
#if MIN_VERSION_persistent_sqlite(2,1,3)
) `shouldThrow` (\(_ :: SqliteException) -> True)
#else
) `shouldThrow` (\(_ :: IOException) -> True) ) `shouldThrow` (\(_ :: IOException) -> True)
#endif
#endif #endif
describe "text functions" $ describe "text functions" $