NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit5f5da0a

committed

transformExpr() was missing some cases it ought to allow; per report

from Greg Stark. Also, twiddle the FuncCall case to not scribble onthe input structure, which was the proximate cause of the problem.Someday we ought to fix things so that transformExpr() isn't calledon already-transformed trees ...

1 parent8d33f80 commit5f5da0aCopy full SHA for 5f5da0a

File tree

1 file changed

+16

-5

lines changed

src/backend/parser
- parse_expr.c

1 file changed

+16

-5

lines changed

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

Lines changed: 16 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.144 2003/02/10 04:44:46 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.145 2003/02/13 18:29:07 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -322,15 +322,23 @@ transformExpr(ParseState pstate, Node expr)`
`322`	`322`	`caseT_FuncCall:`
`323`	`323`	`{`
`324`	`324`	`FuncCallfn= (FuncCall)expr;`
	`325`	`+List*targs;`
`325`	`326`	`List*args;`
`326`	`327`
`327`		`-/* transform the list of arguments */`
`328`		`-foreach(args,fn->args)`
	`328`	`+/*`
	`329`	`+ * Transform the list of arguments. We use a shallow`
	`330`	`+ * list copy and then transform-in-place to avoid O(N^2)`
	`331`	`+ * behavior from repeated lappend's.`
	`332`	`+ */`
	`333`	`+targs=listCopy(fn->args);`
	`334`	`+foreach(args,targs)`
	`335`	`+{`
`329`	`336`	`lfirst(args)=transformExpr(pstate,`
`330`	`337`	`(Node*)lfirst(args));`
	`338`	`+}`
`331`	`339`	`result=ParseFuncOrColumn(pstate,`
`332`	`340`	`fn->funcname,`
`333`		`-fn->args,`
	`341`	`+targs,`
`334`	`342`	`fn->agg_star,`
`335`	`343`	`fn->agg_distinct,`
`336`	`344`	`false);`
`@@ -664,12 +672,15 @@ transformExpr(ParseState pstate, Node expr)`
`664`	`672`	`* taking a conservative approach, and only accepting node`
`665`	`673`	`* types that are demonstrably necessary to accept.`
`666`	`674`	`*********************************************/`
`667`		`-caseT_Expr:`
`668`	`675`	`caseT_Var:`
`669`	`676`	`caseT_Const:`
`670`	`677`	`caseT_Param:`
`671`	`678`	`caseT_Aggref:`
`672`	`679`	`caseT_ArrayRef:`
	`680`	`+caseT_FuncExpr:`
	`681`	`+caseT_OpExpr:`
	`682`	`+caseT_DistinctExpr:`
	`683`	`+caseT_BoolExpr:`
`673`	`684`	`caseT_FieldSelect:`
`674`	`685`	`caseT_RelabelType:`
`675`	`686`	`caseT_CoerceToDomain:`

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!

Commit5f5da0a

File tree

1 file changed

1 file changed

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

0 commit comments