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

Merge pull request #20 from ncaq/master

Browse Source 
use persistent-sqlite >= 2.1.3
This commit is contained in:
Chris Allen 2017-05-25 11:21:18 -05:00 committed by GitHub
commit 96cc3a546b
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esqueleto.cabal
View File

@ -97,7 +97,7 @@ test-suite test
, HUnit , HUnit
, QuickCheck , QuickCheck
, hspec >= 1.8 , hspec >= 1.8
, persistent-sqlite >= 2.1 , persistent-sqlite >= 2.1.3
, persistent-template >= 2.1 , persistent-template >= 2.1
, monad-control , monad-control
, monad-logger >= 0.3 , monad-logger >= 0.3

13
test/Test.hs
View File

@ -38,12 +38,9 @@ import Database.Persist.MySQL ( withMySQLConn
, connectUser , connectUser
, connectPassword , connectPassword
, defaultConnectInfo) , defaultConnectInfo)
#else #endif
import Database.Persist.Sqlite (withSqliteConn) import Database.Persist.Sqlite (withSqliteConn)
#if MIN_VERSION_persistent_sqlite(2,1,3)
import Database.Sqlite (SqliteException) import Database.Sqlite (SqliteException)
#endif
#endif
import Database.Persist.TH import Database.Persist.TH
import Test.Hspec import Test.Hspec
@ -918,12 +915,8 @@ main = do
it "throws an exception on SQLite with <2 arguments" $ it "throws an exception on SQLite with <2 arguments" $
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)
) `shouldThrow` (\(_ :: SqliteException) -> True)
#else
) `shouldThrow` (\(_ :: IOException) -> True)
#endif
#endif #endif
describe "text functions" $ do describe "text functions" $ do