rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow cpluspluscheck to pass by renaming variable 

Use of a C++ keyword as a function name caused problems

Reported-by: Álvaro Herrera
This commit is contained in:
Simon Riggs 2018-04-05 20:06:02 +01:00
parent b9986551e0
commit 530e69e59b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/parser/parse_clause.c
View File

@ -1108,7 +1108,7 @@ Node *
transformFromClauseItem(ParseState *pstate, Node *n, transformFromClauseItem(ParseState *pstate, Node *n,
RangeTblEntry **top_rte, int *top_rti, RangeTblEntry **top_rte, int *top_rti,
RangeTblEntry **right_rte, int *right_rti, RangeTblEntry **right_rte, int *right_rti,
List **namespace) List **fnamespace)
{ {
if (IsA(n, RangeVar)) if (IsA(n, RangeVar))
{ {
@ -1130,7 +1130,7 @@ transformFromClauseItem(ParseState *pstate, Node *n,
Assert(rte == rt_fetch(rtindex, pstate->p_rtable)); Assert(rte == rt_fetch(rtindex, pstate->p_rtable));
*top_rte = rte; *top_rte = rte;
*top_rti = rtindex; *top_rti = rtindex;
*namespace = list_make1(makeDefaultNSItem(rte)); *fnamespace = list_make1(makeDefaultNSItem(rte));
rtr = makeNode(RangeTblRef); rtr = makeNode(RangeTblRef);
rtr->rtindex = rtindex; rtr->rtindex = rtindex;
return (Node *) rtr; return (Node *) rtr;
@ -1148,7 +1148,7 @@ transformFromClauseItem(ParseState *pstate, Node *n,
Assert(rte == rt_fetch(rtindex, pstate->p_rtable)); Assert(rte == rt_fetch(rtindex, pstate->p_rtable));
*top_rte = rte; *top_rte = rte;
*top_rti = rtindex; *top_rti = rtindex;
*namespace = list_make1(makeDefaultNSItem(rte)); *fnamespace = list_make1(makeDefaultNSItem(rte));
rtr = makeNode(RangeTblRef); rtr = makeNode(RangeTblRef);
rtr->rtindex = rtindex; rtr->rtindex = rtindex;
return (Node *) rtr; return (Node *) rtr;
@ -1166,7 +1166,7 @@ transformFromClauseItem(ParseState *pstate, Node *n,
Assert(rte == rt_fetch(rtindex, pstate->p_rtable)); Assert(rte == rt_fetch(rtindex, pstate->p_rtable));
*top_rte = rte; *top_rte = rte;
*top_rti = rtindex; *top_rti = rtindex;
*namespace = list_make1(makeDefaultNSItem(rte)); *fnamespace = list_make1(makeDefaultNSItem(rte));
rtr = makeNode(RangeTblRef); rtr = makeNode(RangeTblRef);
rtr->rtindex = rtindex; rtr->rtindex = rtindex;
return (Node *) rtr; return (Node *) rtr;
@ -1184,7 +1184,7 @@ transformFromClauseItem(ParseState *pstate, Node *n,
Assert(rte == rt_fetch(rtindex, pstate->p_rtable)); Assert(rte == rt_fetch(rtindex, pstate->p_rtable));
*top_rte = rte; *top_rte = rte;
*top_rti = rtindex; *top_rti = rtindex;
*namespace = list_make1(makeDefaultNSItem(rte)); *fnamespace = list_make1(makeDefaultNSItem(rte));
rtr = makeNode(RangeTblRef); rtr = makeNode(RangeTblRef);
rtr->rtindex = rtindex; rtr->rtindex = rtindex;
return (Node *) rtr; return (Node *) rtr;
@ -1199,7 +1199,7 @@ transformFromClauseItem(ParseState *pstate, Node *n,
/* Recursively transform the contained relation */ /* Recursively transform the contained relation */
rel = transformFromClauseItem(pstate, rts->relation, rel = transformFromClauseItem(pstate, rts->relation,
top_rte, top_rti, NULL, NULL, namespace); top_rte, top_rti, NULL, NULL, fnamespace);
/* Currently, grammar could only return a RangeVar as contained rel */ /* Currently, grammar could only return a RangeVar as contained rel */
rtr = castNode(RangeTblRef, rel); rtr = castNode(RangeTblRef, rel);
rte = rt_fetch(rtr->rtindex, pstate->p_rtable); rte = rt_fetch(rtr->rtindex, pstate->p_rtable);
@ -1558,7 +1558,7 @@ transformFromClauseItem(ParseState *pstate, Node *n,
* The join RTE itself is always made visible for unqualified column * The join RTE itself is always made visible for unqualified column
* names. It's visible as a relation name only if it has an alias. * names. It's visible as a relation name only if it has an alias.
*/ */
*namespace = lappend(my_namespace, *fnamespace = lappend(my_namespace,
makeNamespaceItem(rte, makeNamespaceItem(rte,
(j->alias != NULL), (j->alias != NULL),
true, true,

2
src/include/parser/parse_clause.h
View File

@ -23,7 +23,7 @@ extern bool interpretOidsOption(List *defList, bool allowOids);
extern Node *transformFromClauseItem(ParseState *pstate, Node *n, extern Node *transformFromClauseItem(ParseState *pstate, Node *n,
RangeTblEntry **top_rte, int *top_rti, RangeTblEntry **top_rte, int *top_rti,
RangeTblEntry **right_rte, int *right_rti, RangeTblEntry **right_rte, int *right_rti,
List **namespace); List **fnamespace);
extern Node *transformWhereClause(ParseState *pstate, Node *clause, extern Node *transformWhereClause(ParseState *pstate, Node *clause,
ParseExprKind exprKind, const char *constructName); ParseExprKind exprKind, const char *constructName);
extern Node *transformLimitClause(ParseState *pstate, Node *clause, extern Node *transformLimitClause(ParseState *pstate, Node *clause,