NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita65e448

committed

Fix for aggs on views and complex ones. I missed one file.

1 parent4b05912 commita65e448Copy full SHA for a65e448

File tree

1 file changed

+18

-10

lines changed

src/backend/parser
- parse_expr.c

1 file changed

+18

-10

lines changed

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

Lines changed: 18 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.4 1997/12/23 19:36:20 thomas Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.5 1998/01/04 04:53:50 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -55,7 +55,8 @@ transformExpr(ParseState pstate, Node expr, int precedence)`
`55`	`55`	`Node*temp;`
`56`	`56`
`57`	`57`	`/* what if att.attrs == ""?? /`
`58`		`-temp=handleNestedDots(pstate,att,&pstate->p_last_resno);`
	`58`	`+temp=handleNestedDots(pstate,att,&pstate->p_last_resno,`
	`59`	`+precedence);`
`59`	`60`	`if (att->indirection!=NIL)`
`60`	`61`	`{`
`61`	`62`	`List*idx=att->indirection;`
`@@ -156,7 +157,8 @@ transformExpr(ParseState pstate, Node expr, int precedence)`
`156`	`157`
`157`	`158`	`result=ParseFunc(pstate,`
`158`	`159`	`"nullvalue",lcons(lexpr,NIL),`
`159`		`-&pstate->p_last_resno);`
	`160`	`+&pstate->p_last_resno,`
	`161`	`+precedence);`
`160`	`162`	`}`
`161`	`163`	`break;`
`162`	`164`	`caseNOTNULL:`
`@@ -165,7 +167,8 @@ transformExpr(ParseState pstate, Node expr, int precedence)`
`165`	`167`
`166`	`168`	`result=ParseFunc(pstate,`
`167`	`169`	`"nonnullvalue",lcons(lexpr,NIL),`
`168`		`-&pstate->p_last_resno);`
	`170`	`+&pstate->p_last_resno,`
	`171`	`+precedence);`
`169`	`172`	`}`
`170`	`173`	`break;`
`171`	`174`	`caseAND:`
`@@ -242,7 +245,8 @@ transformExpr(ParseState pstate, Node expr, int precedence)`
`242`	`245`	`foreach(args,fn->args)`
`243`	`246`	`lfirst(args)=transformExpr(pstate, (Node*)lfirst(args),precedence);`
`244`	`247`	`result=ParseFunc(pstate,`
`245`		`-fn->funcname,fn->args,&pstate->p_last_resno);`
	`248`	`+fn->funcname,fn->args,&pstate->p_last_resno,`
	`249`	`+precedence);`
`246`	`250`	`break;`
`247`	`251`	`}`
`248`	`252`	`default:`
`@@ -273,7 +277,8 @@ transformIdent(ParseState pstate, Node expr, int precedence)`
`273`	`277`	`att->relname=rte->refname;`
`274`	`278`	`att->attrs=lcons(makeString(ident->name),NIL);`
`275`	`279`	`column_result=`
`276`		`-(Node*)handleNestedDots(pstate,att,&pstate->p_last_resno);`
	`280`	`+(Node*)handleNestedDots(pstate,att,&pstate->p_last_resno,`
	`281`	`+precedence);`
`277`	`282`	`}`
`278`	`283`
`279`	`284`	`/* try to find the ident as a relation */`
`@@ -358,7 +363,7 @@ exprType(Node *expr)`
`358`	`363`	`** a tree with of Iter and Func nodes.`
`359`	`364`	`*/`
`360`	`365`	`Node*`
`361`		`-handleNestedDots(ParseStatepstate,Attrattr,int*curr_resno)`
	`366`	`+handleNestedDots(ParseStatepstate,Attrattr,int*curr_resno,intprecedence)`
`362`	`367`	`{`
`363`	`368`	`List*mutator_iter;`
`364`	`369`	`Node*retval=NULL;`
`@@ -370,7 +375,8 @@ handleNestedDots(ParseState pstate, Attr attr, int *curr_resno)`
`370`	`375`	`retval=`
`371`	`376`	`ParseFunc(pstate,strVal(lfirst(attr->attrs)),`
`372`	`377`	`lcons(param,NIL),`
`373`		`-curr_resno);`
	`378`	`+curr_resno,`
	`379`	`+precedence);`
`374`	`380`	`}`
`375`	`381`	`else`
`376`	`382`	`{`
`@@ -381,14 +387,16 @@ handleNestedDots(ParseState pstate, Attr attr, int *curr_resno)`
`381`	`387`	`retval=`
`382`	`388`	`ParseFunc(pstate,strVal(lfirst(attr->attrs)),`
`383`	`389`	`lcons(ident,NIL),`
`384`		`-curr_resno);`
	`390`	`+curr_resno,`
	`391`	`+precedence);`
`385`	`392`	`}`
`386`	`393`
`387`	`394`	`foreach(mutator_iter,lnext(attr->attrs))`
`388`	`395`	`{`
`389`	`396`	`retval=ParseFunc(pstate,strVal(lfirst(mutator_iter)),`
`390`	`397`	`lcons(retval,NIL),`
`391`		`-curr_resno);`
	`398`	`+curr_resno,`
	`399`	`+precedence);`
`392`	`400`	`}`
`393`	`401`
`394`	`402`	`return (retval);`

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!

Commita65e448

File tree

1 file changed

1 file changed

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

0 commit comments