git.iko.soy/typeable/postgresql-simple
on master help sign in
Refactor conversion function
f6de08cLeon P Smith
src/Database/PostgreSQL/Simple/FromField.hs+14−9
compare with master
unifiedsplit
@@ -290,15 +290,20 @@ instance FromField Date where
290
290
291ff :: BuiltinType -> String -> (B8.ByteString -> Either String a)
291ff :: BuiltinType -> String -> (B8.ByteString -> Either String a)
292 -> Field -> Maybe B8.ByteString -> Ok a
292 -> Field -> Maybe B8.ByteString -> Ok a
293−ff pgType hsType parse f mstr
293+ff pgType hsType parse f mstr =
294− | typeOid f /= builtin2oid pgType
294+ if typeOid f /= builtin2oid pgType
295− = left (Incompatible (B8.unpack (typename f)) (tableOid f) (maybe "" B8.unpack (name f)) hsType "")
295+ then err Incompatible ""
296+ else case mstr of
296− | Nothing <- mstr
297+ Nothing -> err UnexpectedNull ""
297− = left (UnexpectedNull (B8.unpack (typename f)) (tableOid f) (maybe "" B8.unpack (name f)) hsType "")
298− | Just str <- mstr
299− = case parse str of
298+ Just str -> case parse str of
300− Left msg -> left (ConversionFailed (B8.unpack (typename f)) (tableOid f) (maybe "" B8.unpack (name f)) hsType msg)
299+ Left msg -> err ConversionFailed msg
301− Right val -> return val
300+ Right val -> return val
301+ where
302+ err errC msg = left $ errC (B8.unpack (typename f))
303+ (tableOid f)
304+ (maybe "" B8.unpack (name f))
305+ hsType
306+ msg
302{-# INLINE ff #-}
307{-# INLINE ff #-}
303
308
304instance (FromField a, FromField b) => FromField (Either a b) where
309instance (FromField a, FromField b) => FromField (Either a b) where