Remove no-longer-used RTE argument of markVarForSelectPriv().

tglsfdc · tglsfdc · commit d4c746516b8b · 2021-02-11T11:23:25.000-05:00
In the wake of c028faf, this is no longer needed. I left it out of that patch since the API change would be undesirable in a released branch; but there's no reason not to do it in HEAD.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -2525,7 +2525,7 @@ transformWholeRowRef(ParseState pstate, ParseNamespaceItem nsitem,`
`2525`	`2525`	`result->location = location;`
`2526`	`2526`
`2527`	`2527`	`/* mark relation as requiring whole-row SELECT access */`
`2528`		`- markVarForSelectPriv(pstate, result, nsitem->p_rte);`
	`2528`	`+ markVarForSelectPriv(pstate, result);`
`2529`	`2529`
`2530`	`2530`	`return (Node *) result;`
`2531`	`2531`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1397,7 +1397,7 @@ ExpandSingleTable(ParseState pstate, ParseNamespaceItem nsitem,`
`1397`	`1397`	`{`
`1398`	`1398`	`Var var = (Var ) lfirst(l);`
`1399`	`1399`
`1400`		`- markVarForSelectPriv(pstate, var, rte);`
	`1400`	`+ markVarForSelectPriv(pstate, var);`
`1401`	`1401`	`}`
`1402`	`1402`
`1403`	`1403`	`return vars;`