NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitcb7c84f

committed

Check misplaced window functions before checking aggregate/group by sanity.

If somebody puts a window function in WHERE, we should complain about thatin so many words. The previous coding tended to complain about the windowfunction's arguments instead, which is likely to be misleading to users whoare unclear on the semantics of window functions; as seen for example inbug #6440 from Matyas Novak.Just another example of how "add new code at the end" is frequently a badheuristic.

1 parentcbba55d commitcb7c84fCopy full SHA for cb7c84f

File tree

1 file changed

-9

lines changed

src/backend/parser
- analyze.c

1 file changed

-9

lines changed

`‎src/backend/parser/analyze.c`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -316,12 +316,12 @@ transformDeleteStmt(ParseState pstate, DeleteStmt stmt)`
`316`	`316`	`qry->jointree=makeFromExpr(pstate->p_joinlist,qual);`
`317`	`317`
`318`	`318`	`qry->hasSubLinks=pstate->p_hasSubLinks;`
`319`		`-qry->hasAggs=pstate->p_hasAggs;`
`320`		`-if (pstate->p_hasAggs)`
`321`		`-parseCheckAggregates(pstate,qry);`
`322`	`319`	`qry->hasWindowFuncs=pstate->p_hasWindowFuncs;`
`323`	`320`	`if (pstate->p_hasWindowFuncs)`
`324`	`321`	`parseCheckWindowFuncs(pstate,qry);`
	`322`	`+qry->hasAggs=pstate->p_hasAggs;`
	`323`	`+if (pstate->p_hasAggs)`
	`324`	`+parseCheckAggregates(pstate,qry);`
`325`	`325`
`326`	`326`	`assign_query_collations(pstate,qry);`
`327`	`327`
`@@ -970,12 +970,12 @@ transformSelectStmt(ParseState pstate, SelectStmt stmt)`
`970`	`970`	`qry->jointree=makeFromExpr(pstate->p_joinlist,qual);`
`971`	`971`
`972`	`972`	`qry->hasSubLinks=pstate->p_hasSubLinks;`
`973`		`-qry->hasAggs=pstate->p_hasAggs;`
`974`		`-if (pstate->p_hasAggs\|\|qry->groupClause\|\|qry->havingQual)`
`975`		`-parseCheckAggregates(pstate,qry);`
`976`	`973`	`qry->hasWindowFuncs=pstate->p_hasWindowFuncs;`
`977`	`974`	`if (pstate->p_hasWindowFuncs)`
`978`	`975`	`parseCheckWindowFuncs(pstate,qry);`
	`976`	`+qry->hasAggs=pstate->p_hasAggs;`
	`977`	`+if (pstate->p_hasAggs\|\|qry->groupClause\|\|qry->havingQual)`
	`978`	`+parseCheckAggregates(pstate,qry);`
`979`	`979`
`980`	`980`	`foreach(l,stmt->lockingClause)`
`981`	`981`	`{`
`@@ -1448,12 +1448,12 @@ transformSetOperationStmt(ParseState pstate, SelectStmt stmt)`
`1448`	`1448`	`qry->jointree=makeFromExpr(pstate->p_joinlist,NULL);`
`1449`	`1449`
`1450`	`1450`	`qry->hasSubLinks=pstate->p_hasSubLinks;`
`1451`		`-qry->hasAggs=pstate->p_hasAggs;`
`1452`		`-if (pstate->p_hasAggs\|\|qry->groupClause\|\|qry->havingQual)`
`1453`		`-parseCheckAggregates(pstate,qry);`
`1454`	`1451`	`qry->hasWindowFuncs=pstate->p_hasWindowFuncs;`
`1455`	`1452`	`if (pstate->p_hasWindowFuncs)`
`1456`	`1453`	`parseCheckWindowFuncs(pstate,qry);`
	`1454`	`+qry->hasAggs=pstate->p_hasAggs;`
	`1455`	`+if (pstate->p_hasAggs\|\|qry->groupClause\|\|qry->havingQual)`
	`1456`	`+parseCheckAggregates(pstate,qry);`
`1457`	`1457`
`1458`	`1458`	`foreach(l,lockingClause)`
`1459`	`1459`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcb7c84f

File tree

1 file changed

1 file changed

`‎src/backend/parser/analyze.c`

0 commit comments