From f390e9f00d99d980bceca213f8f3617d3abc3dab Mon Sep 17 00:00:00 2001 From: 3kyro Date: Mon, 10 May 2021 21:13:11 +0200 Subject: [PATCH 1/3] Show `keyFromValues` error --- persistent/Database/Persist/Sql/Util.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/persistent/Database/Persist/Sql/Util.hs b/persistent/Database/Persist/Sql/Util.hs index e9a61ecf1..065cc6ae7 100644 --- a/persistent/Database/Persist/Sql/Util.hs +++ b/persistent/Database/Persist/Sql/Util.hs @@ -23,7 +23,7 @@ module Database.Persist.Sql.Util import Data.List.NonEmpty (NonEmpty(..)) import qualified Data.Maybe as Maybe import Data.Monoid ((<>)) -import Data.Text (Text, pack) +import Data.Text (Text, pack, unpack) import qualified Data.Text as T import Database.Persist @@ -188,7 +188,7 @@ parseEntityValues t vals = case fromPersistValues xs of Left e -> Left e Right xs' -> case keyFromValues keyvals of - Left _ -> error "fromPersistValuesComposite': keyFromValues failed" + Left err -> error $ "fromPersistValuesComposite': keyFromValues failed with error: " <> unpack err Right key -> Right (Entity key xs') From 88910bd2596124d2f5f278724d4f32ff6bc2a95d Mon Sep 17 00:00:00 2001 From: 3kyro Date: Mon, 10 May 2021 21:28:39 +0200 Subject: [PATCH 2/3] Update changelog --- persistent/ChangeLog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/persistent/ChangeLog.md b/persistent/ChangeLog.md index 42785f073..8d63f4d0f 100644 --- a/persistent/ChangeLog.md +++ b/persistent/ChangeLog.md @@ -1,5 +1,10 @@ # Changelog for persistent +## 2.13.0.1 + +* [#1268](https://github.com/yesodweb/persistent/pull/1268) + * Show `keyFromValues` error + ## 2.13.0.0 * [#1244](https://github.com/yesodweb/persistent/pull/1244) From 5776526aa4d3ba9115b8280934665ce0435bbe5c Mon Sep 17 00:00:00 2001 From: 3kyro Date: Tue, 11 May 2021 16:42:59 +0200 Subject: [PATCH 3/3] Incorporate review suggestions --- persistent/Database/Persist/Sql/Util.hs | 5 +++-- persistent/persistent.cabal | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/persistent/Database/Persist/Sql/Util.hs b/persistent/Database/Persist/Sql/Util.hs index 065cc6ae7..c871d5746 100644 --- a/persistent/Database/Persist/Sql/Util.hs +++ b/persistent/Database/Persist/Sql/Util.hs @@ -23,7 +23,7 @@ module Database.Persist.Sql.Util import Data.List.NonEmpty (NonEmpty(..)) import qualified Data.Maybe as Maybe import Data.Monoid ((<>)) -import Data.Text (Text, pack, unpack) +import Data.Text (Text, pack) import qualified Data.Text as T import Database.Persist @@ -188,7 +188,8 @@ parseEntityValues t vals = case fromPersistValues xs of Left e -> Left e Right xs' -> case keyFromValues keyvals of - Left err -> error $ "fromPersistValuesComposite': keyFromValues failed with error: " <> unpack err + Left err -> error $ "fromPersistValuesComposite': keyFromValues failed with error: " + <> T.unpack err Right key -> Right (Entity key xs') diff --git a/persistent/persistent.cabal b/persistent/persistent.cabal index 4c2669287..ca0b55608 100644 --- a/persistent/persistent.cabal +++ b/persistent/persistent.cabal @@ -1,5 +1,5 @@ name: persistent -version: 2.13.0.0 +version: 2.13.0.1 license: MIT license-file: LICENSE author: Michael Snoyman