这是indexloc提供的服务，不要输入任何密码
Skip to content

do not generate aggregate order by type if relevant columns are not present (fix #1243) #1248

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

Merged
merged 3 commits into from
Dec 20, 2018
Merged

do not generate aggregate order by type if relevant columns are not present (fix #1243) #1248

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
181003f
do not generate aggregate order by type if relevant columns are not p…
rakeshkky Dec 20, 2018
f47a110
Merge branch 'master' into issue-1243-order-by-agg-types-bug
0x777 Dec 20, 2018
d8df6b1
Merge branch 'master' into issue-1243-order-by-agg-types-bug
0x777 Dec 20, 2018
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
6 changes: 5 additions & 1 deletion server/src-lib/Hasura/GraphQL/Schema.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,12 +1143,16 @@ input table_<op>_order_by {
mkTabAggOpOrdByInpObjs
:: QualifiedTable -> [PGCol] -> [PGCol] -> [InpObjTyInfo]
mkTabAggOpOrdByInpObjs tn numCols compCols =
map (mkInpObjTy numCols) numAggOps <> map (mkInpObjTy compCols) compAggOps
mapMaybe (mkInpObjTyM numCols) numAggOps
<> mapMaybe (mkInpObjTyM compCols) compAggOps
where

mkDesc (G.Name op) = G.Description $ "order by " <> op <> "() on columns of table " <>> tn

mkInpObjTyM cols op = bool (Just $ mkInpObjTy cols op) Nothing $ null cols
mkInpObjTy cols op = mkHsraInpTyInfo (Just $ mkDesc op) (mkTabAggOpOrdByTy tn op) $
fromInpValL $ map mkColInpVal cols

mkColInpVal c = InpValInfo Nothing (mkColName c) $ G.toGT
ordByTy

Expand Down