Codebase list haskell-http-link-header / 42e854f
esqueleto: more complete patch for persistent 2.6 Clint Adams 7 years ago
3 changed file(s) with 55 addition(s) and 3 deletion(s). Raw diff Collapse all Expand all
+6
-0
p/haskell-esqueleto/debian/changelog less more
0 haskell-esqueleto (2.4.3-3) experimental; urgency=medium
1
2 * More complete patch for persistent 2.6 compatibility.
3
4 -- Clint Adams <clint@debian.org> Sat, 22 Oct 2016 19:25:09 -0400
5
06 haskell-esqueleto (2.4.3-2) experimental; urgency=medium
17
28 * Incompletely patch for newer persistent. This will break.
+1
-1
p/haskell-esqueleto/debian/control less more
55 Build-Depends: debhelper (>= 9),
66 haskell-devscripts (>= 0.10),
77 cdbs,
8 ghc,
8 ghc (>= 8),
99 ghc-prof,
1010 libghc-blaze-html-dev,
1111 libghc-blaze-html-prof,
+48
-2
p/haskell-esqueleto/debian/patches/newer-persistent less more
00 --- a/esqueleto.cabal
11 +++ b/esqueleto.cabal
2 @@ -66,7 +66,7 @@ library
3 base >= 4.5 && < 4.9
2 @@ -63,10 +63,10 @@
3 other-modules:
4 Database.Esqueleto.Internal.PersistentImport
5 build-depends:
6 - base >= 4.5 && < 4.9
7 + base >= 4.5 && < 4.10
48 , bytestring
59 , text >= 0.11 && < 1.3
610 - , persistent >= 2.1.1.7 && < 2.3
812 , transformers >= 0.2
913 , unordered-containers >= 0.2
1014 , tagged >= 0.2
15 --- a/src/Database/Esqueleto.hs
16 +++ b/src/Database/Esqueleto.hs
17 @@ -430,8 +430,8 @@
18
19 -- | Synonym for 'Database.Persist.Store.delete' that does not
20 -- clash with @esqueleto@'s 'delete'.
21 -deleteKey :: ( PersistStore (PersistEntityBackend val)
22 +deleteKey :: ( PersistStoreWrite b
23 , MonadIO m
24 - , PersistEntity val )
25 - => Key val -> ReaderT (PersistEntityBackend val) m ()
26 + , PersistRecordBackend val b)
27 + => Key val -> ReaderT b m ()
28 deleteKey = Database.Persist.delete
29 --- a/src/Database/Esqueleto/Internal/PersistentImport.hs
30 +++ b/src/Database/Esqueleto/Internal/PersistentImport.hs
31 @@ -5,7 +5,7 @@
32 ) where
33
34 import Database.Persist.Sql hiding
35 - ( BackendSpecificFilter, Filter(..), PersistQuery(..), SelectOpt(..)
36 + ( BackendSpecificFilter, Filter(..), PersistQueryRead(..), SelectOpt(..)
37 , Update(..), delete, deleteWhereCount, updateWhereCount, selectList
38 , selectKeysList, deleteCascadeWhere, (=.), (+=.), (-=.), (*=.), (/=.)
39 , (==.), (!=.), (<.), (>.), (<=.), (>=.), (<-.), (/<-.), (||.)
40 --- a/test/Test.hs
41 +++ b/test/Test.hs
42 @@ -1395,11 +1395,10 @@
43 ----------------------------------------------------------------------
44
45
46 -insert' :: ( Functor m
47 - , PersistStore (PersistEntityBackend val)
48 +insert' :: ( PersistStoreWrite b
49 , MonadIO m
50 - , PersistEntity val )
51 - => val -> ReaderT (PersistEntityBackend val) m (Entity val)
52 + , PersistRecordBackend val b)
53 + => val -> ReaderT b m (Entity val)
54 insert' v = flip Entity v <$> insert v
55
56