NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commita1888b5

committed

Sync addRangeTableEntryForENR() with its peer functions.

addRangeTableEntryForENR had a check for pstate != NULL, which Coveritypointed out was rather useless since it'd already dereferenced pstatebefore that. More to the point, we'd established policy in commitbc93ac1 that we'd require non-NULL pstate for all addRangeTableEntryFor*functions; this test was evidently copied-and-pasted from some olderversion of one of those functions. Make it look more like the others.In passing, make an elog message look more like the rest of the code,too.Michael Paquier

1 parent033b969 commita1888b5Copy full SHA for a1888b5

File tree

1 file changed

-5

lines changed

src/backend/parser
- parse_relation.c

1 file changed

-5

lines changed

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

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1986,11 +1986,12 @@ addRangeTableEntryForENR(ParseState *pstate,`
`1986`	`1986`	`RangeTblEntry*rte=makeNode(RangeTblEntry);`
`1987`	`1987`	`Alias*alias=rv->alias;`
`1988`	`1988`	`char*refname=alias ?alias->aliasname :rv->relname;`
`1989`		`-EphemeralNamedRelationMetadataenrmd=`
`1990`		`-get_visible_ENR(pstate,rv->relname);`
	`1989`	`+EphemeralNamedRelationMetadataenrmd;`
`1991`	`1990`	`TupleDesctupdesc;`
`1992`	`1991`	`intattno;`
`1993`	`1992`
	`1993`	`+Assert(pstate!=NULL);`
	`1994`	`+enrmd=get_visible_ENR(pstate,rv->relname);`
`1994`	`1995`	`Assert(enrmd!=NULL);`
`1995`	`1996`
`1996`	`1997`	`switch (enrmd->enrtype)`
`@@ -2000,7 +2001,7 @@ addRangeTableEntryForENR(ParseState *pstate,`
`2000`	`2001`	`break;`
`2001`	`2002`
`2002`	`2003`	`default:`
`2003`		`-elog(ERROR,"unexpected enrtype of %i",enrmd->enrtype);`
	`2004`	`+elog(ERROR,"unexpected enrtype: %d",enrmd->enrtype);`
`2004`	`2005`	`returnNULL;/* for fussy compilers */`
`2005`	`2006`	`}`
`2006`	`2007`
`@@ -2056,8 +2057,7 @@ addRangeTableEntryForENR(ParseState *pstate,`
`2056`	`2057`	`* Add completed RTE to pstate's range table list, but not to join list`
`2057`	`2058`	`* nor namespace --- caller must do that if appropriate.`
`2058`	`2059`	`*/`
`2059`		`-if (pstate!=NULL)`
`2060`		`-pstate->p_rtable=lappend(pstate->p_rtable,rte);`
	`2060`	`+pstate->p_rtable=lappend(pstate->p_rtable,rte);`
`2061`	`2061`
`2062`	`2062`	`returnrte;`
`2063`	`2063`	`}`

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!

Commita1888b5

File tree

1 file changed

1 file changed

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

0 commit comments