Skip to content

simplify withParams helpers #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robx wants to merge 2 commits into from
Closed

simplify withParams helpers #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc69f4b
withParams*: drop redundant map
robx Jun 29, 2022
325087f
withParams*: drop redundant call to 'length' by using 'withArrayLen'
robx Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions src/Database/PostgreSQL/LibPQ.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,13 +756,11 @@ withParams params action =
withMany (maybeWith B.useAsCString) values $ \c_values ->
withArray c_values $ \vs ->
withArray c_lengths $ \ls ->
withArray formats $ \fs ->
action n ts vs ls fs
withArrayLen formats $ \n fs ->
action (toEnum n) ts vs ls fs
where
(oids, values, lengths, formats) =
(oids, values, c_lengths, formats) =
foldl' accum ([],[],[],[]) $ reverse params
!c_lengths = map toEnum lengths :: [CInt]
!n = toEnum $ length params

accum (!a,!b,!c,!d) Nothing = ( invalidOid:a
, Nothing:b
Expand All @@ -771,7 +769,7 @@ withParams params action =
)
accum (!a,!b,!c,!d) (Just (t,v,f)) = ( t:a
, (Just v):b
, (B.length v):c
, (toEnum $ B.length v):c
, (toEnum $ fromEnum f):d
)

Expand All @@ -784,19 +782,17 @@ withParamsPrepared params action =
withMany (maybeWith B.useAsCString) values $ \c_values ->
withArray c_values $ \vs ->
withArray c_lengths $ \ls ->
withArray formats $ \fs ->
action n vs ls fs
withArrayLen formats $ \n fs ->
action (toEnum n) vs ls fs
where
(values, lengths, formats) = foldl' accum ([],[],[]) $ reverse params
!c_lengths = map toEnum lengths :: [CInt]
!n = toEnum $ length params
(values, c_lengths, formats) = foldl' accum ([],[],[]) $ reverse params

accum (!a,!b,!c) Nothing = ( Nothing:a
, 0:b
, 0:c
)
accum (!a,!b,!c) (Just (v, f)) = ( (Just v):a
, (B.length v):b
, (toEnum $ B.length v):b
, (toEnum $ fromEnum f):c
)

Expand Down