jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: simplify functions in the "hoist from selected fields" process

Browse Source
This commit is contained in:
Laurence Isla
2024-08-21 16:56:32 -05:00
parent e9244f1a4f
commit 2302f78539
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/Plan.hs
+6 -8
View File
@@ -703,14 +703,12 @@ hoistFromSelectFields relAggAlias fields =
let (modifiedField, maybeAgg) = modifyField field
in (modifiedField : newFields, maybeAgg : aggList)
modifyField field =
case csAggFunction field of
Just aggFunc ->
( field { csAggFunction = Nothing, csAggCast = Nothing },
Just ((relAggAlias, determineFieldName field), (aggFunc, csAggCast field, csAlias field)))
Nothing -> (field, Nothing)
determineFieldName field = fromMaybe (cfName $ csField field) (csAlias field)
modifyField field@CoercibleSelectField{csAggFunction=Just aggFunc, csField, csAggCast, csAlias} =
let determineFieldName = fromMaybe (cfName csField) csAlias
updatedField = field {csAggFunction = Nothing, csAggCast = Nothing}
hoistedField = Just ((relAggAlias, determineFieldName), (aggFunc, csAggCast, csAlias))
in (updatedField, hoistedField)
modifyField field = (field, Nothing)
-- Taking the hoisted aggregates, modify the rel selects to apply the aggregates,
-- and any applicable casts or aliases.