From 3036573f573c9166457cc4fc426e160cf23f9181 Mon Sep 17 00:00:00 2001 From: Ian Duncan Date: Mon, 4 Jun 2018 09:30:22 +0900 Subject: [PATCH 1/3] Update yesod-auth and yesod-persistent to persistent-2.9 --- yesod-auth/yesod-auth.cabal | 2 +- yesod-persistent/Yesod/Persist/Core.hs | 4 ++++ yesod-persistent/yesod-persistent.cabal | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 22298eb7..120950cc 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,5 +1,5 @@ name: yesod-auth -version: 1.6.3 +version: 1.6.4 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin diff --git a/yesod-persistent/Yesod/Persist/Core.hs b/yesod-persistent/Yesod/Persist/Core.hs index 6e81d848..6b9d58d7 100644 --- a/yesod-persistent/Yesod/Persist/Core.hs +++ b/yesod-persistent/Yesod/Persist/Core.hs @@ -98,7 +98,11 @@ defaultGetDBRunner getPool = do (relKey, (conn, local)) <- allocate (do (conn, local) <- takeResource pool +#if MIN_VERSION_persistent(2,9,0) + withPrep conn (\c f -> SQL.connBegin c f Nothing) +#else withPrep conn SQL.connBegin +#endif return (conn, local) ) (\(conn, local) -> do diff --git a/yesod-persistent/yesod-persistent.cabal b/yesod-persistent/yesod-persistent.cabal index daf5ae4b..2af6550a 100644 --- a/yesod-persistent/yesod-persistent.cabal +++ b/yesod-persistent/yesod-persistent.cabal @@ -1,5 +1,5 @@ name: yesod-persistent -version: 1.6.0 +version: 1.6.1 license: MIT license-file: LICENSE author: Michael Snoyman @@ -16,7 +16,7 @@ extra-source-files: README.md ChangeLog.md library build-depends: base >= 4 && < 5 , yesod-core >= 1.6 && < 1.7 - , persistent >= 2.8 && < 2.9 + , persistent >= 2.8 && < 2.10 , persistent-template >= 2.1 && < 2.8 , transformers >= 0.2.2 , blaze-builder From 2d14cdbf1a6e3979d95ca6b46d050ff52fe29adc Mon Sep 17 00:00:00 2001 From: Ian Duncan Date: Wed, 13 Jun 2018 09:18:31 +0900 Subject: [PATCH 2/3] Update changelogs for yesod-persistent and yesod-auth --- yesod-auth/ChangeLog.md | 4 ++++ yesod-persistent/ChangeLog.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/yesod-auth/ChangeLog.md b/yesod-auth/ChangeLog.md index a22f1e32..7affabb3 100644 --- a/yesod-auth/ChangeLog.md +++ b/yesod-auth/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.4 + +* Add support for persistent 2.9 [#1516](https://github.com/yesodweb/yesod/pull/1516) + ## 1.6.3 * Generalize GoogleEmail2.getPerson [#1501](https://github.com/yesodweb/yesod/pull/1501) diff --git a/yesod-persistent/ChangeLog.md b/yesod-persistent/ChangeLog.md index 1cda90f9..3edf8e34 100644 --- a/yesod-persistent/ChangeLog.md +++ b/yesod-persistent/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.1 + +* Add support for persistent 2.9 [#1516](https://github.com/yesodweb/yesod/pull/1516) + ## 1.6.0 * Upgrade to yesod-core 1.6.0 From bf97821b68f731c16fddff3d601558b5c98887f4 Mon Sep 17 00:00:00 2001 From: Ian Duncan Date: Wed, 13 Jun 2018 13:21:23 +0900 Subject: [PATCH 3/3] Fix merge conflict --- yesod-auth/yesod-auth.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 120950cc..f9849720 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -43,7 +43,7 @@ library , http-types , memory , nonce >= 1.0.2 && < 1.1 - , persistent >= 2.8 && < 2.9 + , persistent >= 2.8 && < 2.10 , random >= 1.0.0.2 , safe , shakespeare