diff options
| -rw-r--r-- | src/backend/parser/parse_clause.c | 8 | ||||
| -rw-r--r-- | src/backend/parser/parse_expr.c | 2 | ||||
| -rw-r--r-- | src/backend/parser/parse_relation.c | 8 | ||||
| -rw-r--r-- | src/backend/parser/parse_target.c | 2 | ||||
| -rw-r--r-- | src/include/parser/parse_relation.h | 3 |
5 files changed, 8 insertions, 15 deletions
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 672245ded7a..bdf8ec46e2b 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -58,7 +58,6 @@ static int extractRemainingColumns(ParseNamespaceColumn *src_nscolumns, List **res_colnames, List **res_colvars, ParseNamespaceColumn *res_nscolumns); static Node *transformJoinUsingClause(ParseState *pstate, - RangeTblEntry *leftRTE, RangeTblEntry *rightRTE, List *leftVars, List *rightVars); static Node *transformJoinOnClause(ParseState *pstate, JoinExpr *j, List *namespace); @@ -302,7 +301,6 @@ extractRemainingColumns(ParseNamespaceColumn *src_nscolumns, */ static Node * transformJoinUsingClause(ParseState *pstate, - RangeTblEntry *leftRTE, RangeTblEntry *rightRTE, List *leftVars, List *rightVars) { Node *result; @@ -325,8 +323,8 @@ transformJoinUsingClause(ParseState *pstate, A_Expr *e; /* Require read access to the join variables */ - markVarForSelectPriv(pstate, lvar, leftRTE); - markVarForSelectPriv(pstate, rvar, rightRTE); + markVarForSelectPriv(pstate, lvar); + markVarForSelectPriv(pstate, rvar); /* Now create the lvar = rvar join condition */ e = makeSimpleA_Expr(AEXPR_OP, "=", @@ -1411,8 +1409,6 @@ transformFromClauseItem(ParseState *pstate, Node *n, } j->quals = transformJoinUsingClause(pstate, - l_nsitem->p_rte, - r_nsitem->p_rte, l_usingvars, r_usingvars); } diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 6c87783b2c7..f869e159d63 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -2525,7 +2525,7 @@ transformWholeRowRef(ParseState *pstate, ParseNamespaceItem *nsitem, result->location = location; /* mark relation as requiring whole-row SELECT access */ - markVarForSelectPriv(pstate, result, nsitem->p_rte); + markVarForSelectPriv(pstate, result); return (Node *) result; } diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index d0ec95c7798..ca02982e0b3 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -740,7 +740,7 @@ scanNSItemForColumn(ParseState *pstate, ParseNamespaceItem *nsitem, var->location = location; /* Require read access to the column */ - markVarForSelectPriv(pstate, var, rte); + markVarForSelectPriv(pstate, var); return (Node *) var; } @@ -1074,11 +1074,9 @@ markRTEForSelectPriv(ParseState *pstate, int rtindex, AttrNumber col) * markVarForSelectPriv * Mark the RTE referenced by the Var as requiring SELECT privilege * for the Var's column (the Var could be a whole-row Var, too) - * - * The rte argument is unused and will be removed later. */ void -markVarForSelectPriv(ParseState *pstate, Var *var, RangeTblEntry *rte) +markVarForSelectPriv(ParseState *pstate, Var *var) { Index lv; @@ -3123,7 +3121,7 @@ expandNSItemAttrs(ParseState *pstate, ParseNamespaceItem *nsitem, te_list = lappend(te_list, te); /* Require read access to each column */ - markVarForSelectPriv(pstate, varnode, rte); + markVarForSelectPriv(pstate, varnode); } Assert(name == NULL && var == NULL); /* lists not the same length? */ diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index f582665aeae..6e8fbc47801 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -1397,7 +1397,7 @@ ExpandSingleTable(ParseState *pstate, ParseNamespaceItem *nsitem, { Var *var = (Var *) lfirst(l); - markVarForSelectPriv(pstate, var, rte); + markVarForSelectPriv(pstate, var); } return vars; diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 35e64070a89..5dbe5ba2e27 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -41,8 +41,7 @@ extern Node *scanNSItemForColumn(ParseState *pstate, ParseNamespaceItem *nsitem, int location); extern Node *colNameToVar(ParseState *pstate, const char *colname, bool localonly, int location); -extern void markVarForSelectPriv(ParseState *pstate, Var *var, - RangeTblEntry *rte); +extern void markVarForSelectPriv(ParseState *pstate, Var *var); extern Relation parserOpenTable(ParseState *pstate, const RangeVar *relation, int lockmode); extern ParseNamespaceItem *addRangeTableEntry(ParseState *pstate, |