File 0001-Port-to-Stackage-Nightly-and-persistent-2.... of Package ghc-esqueleto

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Port-to-Stackage-Nightly-and-persistent-2.6.patch of Package ghc-esqueleto

From 5470f424f4f7d31889aded7d36667629f2e01530 Mon Sep 17 00:00:00 2001
From: Echo Nolan <echo@echonolan.net>
Date: Thu, 1 Sep 2016 13:07:12 -0700
Subject: [PATCH 1/2] Port to Stackage Nightly and persistent-2.6

---
 esqueleto.cabal                                     | 2 +-
 src/Database/Esqueleto.hs                           | 6 +++---
 src/Database/Esqueleto/Internal/PersistentImport.hs | 2 +-
 test/Test.hs                                        | 7 +++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/esqueleto.cabal b/esqueleto.cabal
index d861836..dc75dfd 100644
--- a/esqueleto.cabal
+++ b/esqueleto.cabal
@@ -67,7 +67,7 @@ library
       base                 >= 4.5     && < 4.10
     , bytestring
     , text                 >= 0.11    && < 1.3
-    , persistent           >= 2.1.1.7 && < 2.3
+    , persistent           >= 2.6     && < 2.7
     , transformers         >= 0.2
     , unordered-containers >= 0.2
     , tagged               >= 0.2
diff --git a/src/Database/Esqueleto.hs b/src/Database/Esqueleto.hs
index eb135c2..d9ab78a 100644
--- a/src/Database/Esqueleto.hs
+++ b/src/Database/Esqueleto.hs
@@ -430,8 +430,8 @@ valJ = val . unValue
 
 -- | Synonym for 'Database.Persist.Store.delete' that does not
 -- clash with @esqueleto@'s 'delete'.
-deleteKey :: ( PersistStore (PersistEntityBackend val)
+deleteKey :: ( PersistStoreWrite b
              , MonadIO m
-             , PersistEntity val )
-          => Key val -> ReaderT (PersistEntityBackend val) m ()
+             , PersistRecordBackend val b)
+          => Key val -> ReaderT b m ()
 deleteKey = Database.Persist.delete
diff --git a/src/Database/Esqueleto/Internal/PersistentImport.hs b/src/Database/Esqueleto/Internal/PersistentImport.hs
index ad193e0..979668c 100644
--- a/src/Database/Esqueleto/Internal/PersistentImport.hs
+++ b/src/Database/Esqueleto/Internal/PersistentImport.hs
@@ -5,7 +5,7 @@ module Database.Esqueleto.Internal.PersistentImport
   ) where
 
 import Database.Persist.Sql hiding
-  ( BackendSpecificFilter, Filter(..), PersistQuery(..), SelectOpt(..)
+  ( BackendSpecificFilter, Filter(..), PersistQueryRead(..), SelectOpt(..)
   , Update(..), delete, deleteWhereCount, updateWhereCount, selectList
   , selectKeysList, deleteCascadeWhere, (=.), (+=.), (-=.), (*=.), (/=.)
   , (==.), (!=.), (<.), (>.), (<=.), (>=.), (<-.), (/<-.), (||.)
diff --git a/test/Test.hs b/test/Test.hs
index 80c6784..48650b3 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -1395,11 +1395,10 @@ main = do
 ----------------------------------------------------------------------
 
 
-insert' :: ( Functor m
-           , PersistStore (PersistEntityBackend val)
+insert' :: ( PersistStoreWrite b
            , MonadIO m
-           , PersistEntity val )
-        => val -> ReaderT (PersistEntityBackend val) m (Entity val)
+           , PersistRecordBackend val b)
+        => val -> ReaderT b m (Entity val)
 insert' v = flip Entity v <$> insert v
 
 
-- 
2.10.0

Places

File 0001-Port-to-Stackage-Nightly-and-persistent-2.6.patch of Package ghc-esqueleto

Places