Merge pull request #197 from kuribas/master

haskell-hvr · Nov 16, 2021 · 5a410c9 · 5a410c9
2 parents 792cf58 + 43eaa6b
commit 5a410c9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+## Version 0.5.3.0
+
+ * improve error messages for `lookup` and NamedRecord parsers.
+
 ## Version 0.5.2.0
 
  * Add `FromField`/`ToField` instances for `Identity` and `Const` (#158)

diff --git a/cassava.cabal b/cassava.cabal
@@ -1,6 +1,6 @@
 cabal-version:       1.12
 Name:                cassava
-Version:             0.5.2.0
+Version:             0.5.3.0
 Synopsis:            A CSV parsing and encoding library
 Description: {
 

diff --git a/src/Data/Csv/Conversion.hs b/src/Data/Csv/Conversion.hs
@@ -1148,8 +1148,11 @@ unsafeIndex v idx = parseField (V.unsafeIndex v idx)
 -- 'empty' if the field is missing or if the value cannot be converted
 -- to the desired type.
 lookup :: FromField a => NamedRecord -> B.ByteString -> Parser a
-lookup m name = maybe (fail err) parseField $ HM.lookup name m
+lookup m name = maybe (fail err) parseField' $ HM.lookup name m
   where err = "no field named " ++ show (B8.unpack name)
+        parseField' fld = case runParser (parseField fld) of
+          Left e -> fail $ "in named field " ++ show (B8.unpack name) ++ ": " ++ e
+          Right res -> pure res
 {-# INLINE lookup #-}
 
 -- | Alias for 'lookup'.