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

Merge branch 'master' of https://github.com/iand675/yesod into update-persistent

Browse Source
This commit is contained in:
Dan Burton 2018-10-11 12:54:52 -04:00
commit 49dcfe02af
No known key found for this signature in database
GPG Key ID: 41F154F410EC12E0
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yesod-auth/ChangeLog.md
View File

@ -1,6 +1,11 @@
# ChangeLog for yesod-auth # ChangeLog for yesod-auth
## 1.6.4.2
* Add support for persistent 2.9 [#1516](https://github.com/yesodweb/yesod/pull/1516)
## 1.6.4.1 ## 1.6.4.1
* Email: Fix forgot-password endpoint [#1537](https://github.com/yesodweb/yesod/pull/1537) * Email: Fix forgot-password endpoint [#1537](https://github.com/yesodweb/yesod/pull/1537)
## 1.6.4 ## 1.6.4

4
yesod-auth/yesod-auth.cabal
View File

@ -1,5 +1,5 @@
name: yesod-auth name: yesod-auth
version: 1.6.4.1 version: 1.6.4.2
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman, Patrick Brisbin author: Michael Snoyman, Patrick Brisbin
@ -43,7 +43,7 @@ library
, http-types , http-types
, memory , memory
, nonce >= 1.0.2 && < 1.1 , nonce >= 1.0.2 && < 1.1
, persistent >= 2.8 && < 2.9 , persistent >= 2.8 && < 2.10
, random >= 1.0.0.2 , random >= 1.0.0.2
, safe , safe
, shakespeare , shakespeare

4
yesod-persistent/ChangeLog.md
View File

@ -1,3 +1,7 @@
## 1.6.1
* Add support for persistent 2.9 [#1516](https://github.com/yesodweb/yesod/pull/1516)
## 1.6.0 ## 1.6.0
* Upgrade to yesod-core 1.6.0 * Upgrade to yesod-core 1.6.0

4
yesod-persistent/Yesod/Persist/Core.hs
View File

@ -98,7 +98,11 @@ defaultGetDBRunner getPool = do
(relKey, (conn, local)) <- allocate (relKey, (conn, local)) <- allocate
(do (do
(conn, local) <- takeResource pool (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 withPrep conn SQL.connBegin
#endif
return (conn, local) return (conn, local)
) )
(\(conn, local) -> do (\(conn, local) -> do

4
yesod-persistent/yesod-persistent.cabal
View File

@ -1,5 +1,5 @@
name: yesod-persistent name: yesod-persistent
version: 1.6.0 version: 1.6.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -16,7 +16,7 @@ extra-source-files: README.md ChangeLog.md
library library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 1.6 && < 1.7 , yesod-core >= 1.6 && < 1.7
, persistent >= 2.8 && < 2.9 , persistent >= 2.8 && < 2.10
, persistent-template >= 2.1 && < 2.8 , persistent-template >= 2.1 && < 2.8
, transformers >= 0.2.2 , transformers >= 0.2.2
, blaze-builder , blaze-builder