Hello community, here is the log from the commit of package ghc-persistent for openSUSE:Factory checked in at 2015-12-23 08:50:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-persistent (Old) and /work/SRC/openSUSE:Factory/.ghc-persistent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-persistent" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-persistent/ghc-persistent.changes 2015-12-09 22:17:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-persistent.new/ghc-persistent.changes 2015-12-23 08:50:14.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 17 10:42:36 UTC 2015 - [email protected] + +- update to 2.2.4 +* Workaround for side-exiting transformers in runSqlConn + +------------------------------------------------------------------- Old: ---- persistent-2.2.3.tar.gz New: ---- persistent-2.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-persistent.spec ++++++ --- /var/tmp/diff_new_pack.kNwmVk/_old 2015-12-23 08:50:15.000000000 +0100 +++ /var/tmp/diff_new_pack.kNwmVk/_new 2015-12-23 08:50:15.000000000 +0100 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-persistent -Version: 2.2.3 +Version: 2.2.4 Release: 0 Summary: Type-safe, multi-backend data serialization License: MIT ++++++ persistent-2.2.3.tar.gz -> persistent-2.2.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-2.2.3/ChangeLog.md new/persistent-2.2.4/ChangeLog.md --- old/persistent-2.2.3/ChangeLog.md 2015-11-29 18:59:28.000000000 +0100 +++ new/persistent-2.2.4/ChangeLog.md 2015-12-14 12:26:57.000000000 +0100 @@ -1,3 +1,7 @@ +## 2.2.4 + +* Workaround for side-exiting transformers in `runSqlConn` [#516](https://github.com/yesodweb/persistent/issues/516) + ## 2.2.3 * PersistField instance for Natural diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-2.2.3/Database/Persist/Sql/Run.hs new/persistent-2.2.4/Database/Persist/Sql/Run.hs --- old/persistent-2.2.3/Database/Persist/Sql/Run.hs 2015-11-15 15:31:39.000000000 +0100 +++ new/persistent-2.2.4/Database/Persist/Sql/Run.hs 2015-12-14 12:26:57.000000000 +0100 @@ -50,13 +50,13 @@ {-# INLINABLE withResourceTimeout #-} runSqlConn :: MonadBaseControl IO m => SqlPersistT m a -> SqlBackend -> m a -runSqlConn r conn = do +runSqlConn r conn = control $ \runInIO -> mask $ \restore -> do let getter = getStmtConn conn - liftBase $ connBegin conn getter + restore $ connBegin conn getter x <- onException - (runReaderT r conn) - (liftBase $ connRollback conn getter) - liftBase $ connCommit conn getter + (restore $ runInIO $ runReaderT r conn) + (restore $ connRollback conn getter) + restore $ connCommit conn getter return x runSqlPersistM :: SqlPersistM a -> SqlBackend -> IO a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-2.2.3/persistent.cabal new/persistent-2.2.4/persistent.cabal --- old/persistent-2.2.3/persistent.cabal 2015-11-29 18:59:28.000000000 +0100 +++ new/persistent-2.2.4/persistent.cabal 2015-12-14 12:26:57.000000000 +0100 @@ -1,5 +1,5 @@ name: persistent -version: 2.2.3 +version: 2.2.4 license: MIT license-file: LICENSE author: Michael Snoyman <[email protected]>
