NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit9432b6d

committed

Do not assign output columns to junk attributes created from

GROUP BY or ORDER BY expressions in INSERT ... SELECT.

1 parent505b518 commit9432b6dCopy full SHA for 9432b6d

File tree

1 file changed

+11

-10

lines changed

src/backend/parser
- parse_target.c

1 file changed

+11

-10

lines changed

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

Lines changed: 11 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_target.c,v 1.38 1999/05/22 04:12:28 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.39 1999/05/23 21:42:09 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -32,16 +32,12 @@`
`32`	`32`
`33`	`33`
`34`	`34`	`staticListExpandAllTables(ParseStatepstate);`
`35`		`-charFigureColname(Nodeexpr,Node*resval);`
`36`		`-`
	`35`	`+staticcharFigureColname(Nodeexpr,Node*resval);`
`37`	`36`	`staticNodeSizeTargetExpr(ParseStatepstate,`
`38`	`37`	`Node*expr,`
`39`	`38`	`Oidattrtype,`
`40`	`39`	`int32attrtypmod);`
`41`	`40`
`42`		`-staticTargetEntry*`
`43`		`-MakeTargetEntryCase(ParseState*pstate,`
`44`		`-ResTarget*res);`
`45`	`41`
`46`	`42`	`/* MakeTargetEntryIdent()`
`47`	`43`	`* Transforms an Ident Node to a Target Entry`
`@@ -66,8 +62,13 @@ MakeTargetEntryIdent(ParseState *pstate,`
`66`	`62`	`Oidattrtype_target;`
`67`	`63`	`TargetEntry*tent=makeNode(TargetEntry);`
`68`	`64`
`69`		`-if (pstate->p_is_insert)`
	`65`	`+if (pstate->p_is_insert&& !resjunk)`
`70`	`66`	`{`
	`67`	`+/* Assign column name of destination column to the new TLE.`
	`68`	`+ * XXX this is probably WRONG in INSERT ... SELECT case,`
	`69`	`+ * since handling of GROUP BY and so forth probably should use`
	`70`	`+ * the source table's names not the destination's names.`
	`71`	`+ */`
`71`	`72`	`if (pstate->p_insert_columns!=NIL)`
`72`	`73`	`{`
`73`	`74`	`Ident*id=lfirst(pstate->p_insert_columns);`
`@@ -79,7 +80,7 @@ MakeTargetEntryIdent(ParseState *pstate,`
`79`	`80`	`elog(ERROR,"INSERT has more expressions than target columns");`
`80`	`81`	`}`
`81`	`82`
`82`		`-if (pstate->p_is_insert\|\|pstate->p_is_update)`
	`83`	`+if ((pstate->p_is_insert\|\|pstate->p_is_update)&& !resjunk)`
`83`	`84`	`{`
`84`	`85`	`Oidattrtype_id;`
`85`	`86`	`intresdomno_id,`
`@@ -208,7 +209,7 @@ MakeTargetEntryExpr(ParseState *pstate,`
`208`	`209`	`type_mod=-1;`
`209`	`210`
`210`	`211`	`/* Process target columns that will be receiving results */`
`211`		`-if (pstate->p_is_insert\|\|pstate->p_is_update)`
	`212`	`+if ((pstate->p_is_insert\|\|pstate->p_is_update)&& !resjunk)`
`212`	`213`	`{`
`213`	`214`
`214`	`215`	`/*`
`@@ -870,7 +871,7 @@ ExpandAllTables(ParseState *pstate)`
`870`	`871`	`* list, we have to guess.`
`871`	`872`	`*`
`872`	`873`	`*/`
`873`		`-char*`
	`874`	`+staticchar*`
`874`	`875`	`FigureColname(Nodeexpr,Noderesval)`
`875`	`876`	`{`
`876`	`877`	`switch (nodeTag(expr))`

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!

Commit9432b6d

File tree

1 file changed

1 file changed

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

0 commit comments