nikita-volkov/hasql
1
1
Fork 0
mirror of https://github.com/nikita-volkov/hasql.git synced 2024-12-26 20:12:09 +03:00
Code Issues Projects Releases Wiki Activity

parse -> parseRow

Browse Source
This commit is contained in:
Nikita Volkov 2014-10-23 16:33:33 +04:00
parent e787181618
commit d47e98e9a3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Hasql.hs
View File

@ -293,4 +293,4 @@ hoistBackendStream :: RowParser b r => Backend.ResultsStream b -> ResultsStream
hoistBackendStream (w, s) =
TransactionListT $ hoist (Transaction . lift) $ do
row <- ($ s) $ ListT.slice $ fromMaybe ($bug "Invalid row width") $ ListT.positive w
either (lift . throwIO . ResultParsingError) return $ RowParser.parse row
either (lift . throwIO . ResultParsingError) return $ RowParser.parseRow row

12
library/Hasql/RowParser.hs
View File

@ -7,13 +7,13 @@ import qualified Hasql.Backend as Backend
class RowParser b r where
parse :: [Backend.Result b] -> Either Text r
parseRow :: [Backend.Result b] -> Either Text r
instance RowParser b () where
parse = \case [] -> Right (); _ -> Left $ "Row is not empty"
parseRow = \case [] -> Right (); _ -> Left $ "Row is not empty"
instance Backend.Mapping b v => RowParser b (Identity v) where
parse l = do
parseRow l = do
h <- maybe (Left $ "Empty row") Right $ headMay l
Identity <$> Backend.parseResult h
@ -21,7 +21,7 @@ instance Backend.Mapping b v => RowParser b (Identity v) where
let
inst :: Int -> Dec
inst arity =
InstanceD constraints head [parseDec]
InstanceD constraints head [parseRowDec]
where
varNames =
[1 .. arity] >>= \i -> return (mkName ('_' : show i))
@ -33,8 +33,8 @@ let
map (\t -> ClassP ''Backend.Mapping [backendType, t]) varTypes
head =
AppT (AppT (ConT ''RowParser) backendType) (foldl AppT (TupleT arity) varTypes)
parseDec =
FunD 'parse [c1, c2]
parseRowDec =
FunD 'parseRow [c1, c2]
where
c1 =
Clause [ListP (map VarP varNames)] (NormalB e) []