Use persistent 1.1.
This commit is contained in:
parent
f7d2ad0a0b
commit
9db4408d7c
@ -55,7 +55,7 @@ library
|
|||||||
build-depends:
|
build-depends:
|
||||||
base >= 4.5 && < 4.7
|
base >= 4.5 && < 4.7
|
||||||
, text == 0.11.*
|
, text == 0.11.*
|
||||||
, persistent >= 1.0.1 && < 1.1
|
, persistent == 1.1.*
|
||||||
, transformers >= 0.2
|
, transformers >= 0.2
|
||||||
, unordered-containers >= 0.2
|
, unordered-containers >= 0.2
|
||||||
|
|
||||||
@ -79,8 +79,8 @@ test-suite test
|
|||||||
, HUnit
|
, HUnit
|
||||||
, QuickCheck
|
, QuickCheck
|
||||||
, hspec == 1.3.*
|
, hspec == 1.3.*
|
||||||
, persistent-sqlite == 1.0.*
|
, persistent-sqlite == 1.1.*
|
||||||
, persistent-template == 1.0.*
|
, persistent-template == 1.1.*
|
||||||
, monad-control
|
, monad-control
|
||||||
, monad-logger
|
, monad-logger
|
||||||
, fast-logger >= 0.2 && < 0.4
|
, fast-logger >= 0.2 && < 0.4
|
||||||
|
|||||||
@ -296,8 +296,10 @@ import qualified Database.Persist.Store
|
|||||||
|
|
||||||
-- | Synonym for 'Database.Persist.Store.delete' that does not
|
-- | Synonym for 'Database.Persist.Store.delete' that does not
|
||||||
-- clash with @esqueleto@'s 'delete'.
|
-- clash with @esqueleto@'s 'delete'.
|
||||||
deleteKey :: (PersistStore backend m, PersistEntity val)
|
deleteKey :: ( PersistStore m
|
||||||
=> Key backend val -> backend m ()
|
, PersistMonadBackend m ~ PersistEntityBackend val
|
||||||
|
, PersistEntity val )
|
||||||
|
=> Key val -> m ()
|
||||||
deleteKey = Database.Persist.Store.delete
|
deleteKey = Database.Persist.Store.delete
|
||||||
|
|
||||||
-- $reexports
|
-- $reexports
|
||||||
|
|||||||
@ -49,7 +49,7 @@ import Data.Monoid (Monoid(..), (<>))
|
|||||||
import Database.Persist.EntityDef
|
import Database.Persist.EntityDef
|
||||||
import Database.Persist.GenericSql
|
import Database.Persist.GenericSql
|
||||||
import Database.Persist.GenericSql.Internal (Connection(escapeName, noLimit))
|
import Database.Persist.GenericSql.Internal (Connection(escapeName, noLimit))
|
||||||
import Database.Persist.GenericSql.Raw (withStmt, execute)
|
import Database.Persist.GenericSql.Raw (execute, SqlBackend, withStmt)
|
||||||
import Database.Persist.Store hiding (delete)
|
import Database.Persist.Store hiding (delete)
|
||||||
import qualified Control.Monad.Trans.Reader as R
|
import qualified Control.Monad.Trans.Reader as R
|
||||||
import qualified Control.Monad.Trans.State as S
|
import qualified Control.Monad.Trans.State as S
|
||||||
@ -83,7 +83,7 @@ instance Applicative SqlQuery where
|
|||||||
|
|
||||||
-- | Constraint synonym for @persistent@ entities whose backend
|
-- | Constraint synonym for @persistent@ entities whose backend
|
||||||
-- is 'SqlPersist'.
|
-- is 'SqlPersist'.
|
||||||
type SqlEntity ent = (PersistEntity ent, PersistEntityBackend ent ~ SqlPersist)
|
type SqlEntity ent = (PersistEntity ent, PersistEntityBackend ent ~ SqlBackend)
|
||||||
|
|
||||||
|
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
@ -242,7 +242,7 @@ parensM Parens = parens
|
|||||||
data OrderByType = ASC | DESC
|
data OrderByType = ASC | DESC
|
||||||
|
|
||||||
|
|
||||||
instance Esqueleto SqlQuery SqlExpr SqlPersist where
|
instance Esqueleto SqlQuery SqlExpr SqlBackend where
|
||||||
fromStart = x
|
fromStart = x
|
||||||
where
|
where
|
||||||
x = do
|
x = do
|
||||||
|
|||||||
@ -544,8 +544,11 @@ main = do
|
|||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
insert' :: (PersistEntity val, PersistStore (PersistEntityBackend val) m)
|
insert' :: ( Functor m
|
||||||
=> val -> PersistEntityBackend val m (Entity val)
|
, PersistStore m
|
||||||
|
, PersistMonadBackend m ~ PersistEntityBackend val
|
||||||
|
, PersistEntity val )
|
||||||
|
=> val -> m (Entity val)
|
||||||
insert' v = flip Entity v <$> insert v
|
insert' v = flip Entity v <$> insert v
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user