persistent 2.11.0.3 → 2.11.0.4

raw patch · 5 files changed

+10/−4 lines, 5 filesdep ~base

Dependency ranges changed: base

Files

ChangeLog.md +5/−0
Database/Persist/Quasi.hs +2/−2
Database/Persist/Sql/Run.hs +1/−1
persistent.cabal +1/−1
test/main.hs +1/−0

ChangeLog.md view

@@ -1,5 +1,10 @@ # Changelog for persistent +## 2.11.0.4++* Fix a compile error [#1213](https://github.com/yesodweb/persistent/pull/1213)+    * That's what I get for running this stuff with flakey CI!+ ## 2.11.0.3  * Backported the fix from [#1207](https://github.com/yesodweb/persistent/pull/1207) for asynchronous exceptions.

Database/Persist/Quasi.hs view

@@ -1200,14 +1200,14 @@                             Nothing ->                                 go (this : acc) mupd mdel rest     nope msg =-        error $ msg <> ", tokens: " <> show allTokens+        error $ msg `mappend` ", tokens: " `mappend` show allTokens  parseCascadeAction     :: CascadePrefix     -> Text     -> Maybe CascadeAction parseCascadeAction prfx text = do-    cascadeStr <- T.stripPrefix ("On" <> toPrefix prfx) text+    cascadeStr <- T.stripPrefix ("On" `mappend` toPrefix prfx) text     case readEither (T.unpack cascadeStr) of         Right a ->             Just a

Database/Persist/Sql/Run.hs view

@@ -94,7 +94,7 @@ runSqlPool r pconn =     withRunInIO $ \runInIO ->     withResource pconn $ \conn ->-    UE.mask $ \restore ->+    UE.mask $ \restore -> do         let sqlBackend = projectBackend conn         let getter = getStmtConn sqlBackend         restore $ connBegin sqlBackend getter Nothing

persistent.cabal view

@@ -1,5 +1,5 @@ name:            persistent-version:         2.11.0.3+version:         2.11.0.4 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>

test/main.hs view

@@ -9,6 +9,7 @@ import Data.Time import Text.Shakespeare.Text import Data.List+import Data.Monoid  import Database.Persist.Class.PersistField import Database.Persist.Quasi