Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit d4c7465

Browse filesBrowse files
tglsfdctglsfdc
committed
Remove no-longer-used RTE argument of markVarForSelectPriv().
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.
1 parent 42d74e0 commit d4c7465
Copy full SHA for d4c7465

File tree

Expand file treeCollapse file tree

5 files changed

+8
-15
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+8
-15
lines changed

‎src/backend/parser/parse_clause.c

Copy file name to clipboardExpand all lines: src/backend/parser/parse_clause.c
+2-6Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ static int extractRemainingColumns(ParseNamespaceColumn *src_nscolumns,
5858
List **res_colnames, List **res_colvars,
5959
ParseNamespaceColumn *res_nscolumns);
6060
static Node *transformJoinUsingClause(ParseState *pstate,
61-
RangeTblEntry *leftRTE, RangeTblEntry *rightRTE,
6261
List *leftVars, List *rightVars);
6362
static Node *transformJoinOnClause(ParseState *pstate, JoinExpr *j,
6463
List *namespace);
@@ -302,7 +301,6 @@ extractRemainingColumns(ParseNamespaceColumn *src_nscolumns,
302301
*/
303302
static Node *
304303
transformJoinUsingClause(ParseState *pstate,
305-
RangeTblEntry *leftRTE, RangeTblEntry *rightRTE,
306304
List *leftVars, List *rightVars)
307305
{
308306
Node *result;
@@ -325,8 +323,8 @@ transformJoinUsingClause(ParseState *pstate,
325323
A_Expr *e;
326324

327325
/* Require read access to the join variables */
328-
markVarForSelectPriv(pstate, lvar, leftRTE);
329-
markVarForSelectPriv(pstate, rvar, rightRTE);
326+
markVarForSelectPriv(pstate, lvar);
327+
markVarForSelectPriv(pstate, rvar);
330328

331329
/* Now create the lvar = rvar join condition */
332330
e = makeSimpleA_Expr(AEXPR_OP, "=",
@@ -1411,8 +1409,6 @@ transformFromClauseItem(ParseState *pstate, Node *n,
14111409
}
14121410

14131411
j->quals = transformJoinUsingClause(pstate,
1414-
l_nsitem->p_rte,
1415-
r_nsitem->p_rte,
14161412
l_usingvars,
14171413
r_usingvars);
14181414
}

‎src/backend/parser/parse_expr.c

Copy file name to clipboardExpand all lines: src/backend/parser/parse_expr.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2525,7 +2525,7 @@ transformWholeRowRef(ParseState *pstate, ParseNamespaceItem *nsitem,
25252525
result->location = location;
25262526

25272527
/* mark relation as requiring whole-row SELECT access */
2528-
markVarForSelectPriv(pstate, result, nsitem->p_rte);
2528+
markVarForSelectPriv(pstate, result);
25292529

25302530
return (Node *) result;
25312531
}

‎src/backend/parser/parse_relation.c

Copy file name to clipboardExpand all lines: src/backend/parser/parse_relation.c
+3-5Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ scanNSItemForColumn(ParseState *pstate, ParseNamespaceItem *nsitem,
740740
var->location = location;
741741

742742
/* Require read access to the column */
743-
markVarForSelectPriv(pstate, var, rte);
743+
markVarForSelectPriv(pstate, var);
744744

745745
return (Node *) var;
746746
}
@@ -1074,11 +1074,9 @@ markRTEForSelectPriv(ParseState *pstate, int rtindex, AttrNumber col)
10741074
* markVarForSelectPriv
10751075
* Mark the RTE referenced by the Var as requiring SELECT privilege
10761076
* for the Var's column (the Var could be a whole-row Var, too)
1077-
*
1078-
* The rte argument is unused and will be removed later.
10791077
*/
10801078
void
1081-
markVarForSelectPriv(ParseState *pstate, Var *var, RangeTblEntry *rte)
1079+
markVarForSelectPriv(ParseState *pstate, Var *var)
10821080
{
10831081
Index lv;
10841082

@@ -3123,7 +3121,7 @@ expandNSItemAttrs(ParseState *pstate, ParseNamespaceItem *nsitem,
31233121
te_list = lappend(te_list, te);
31243122

31253123
/* Require read access to each column */
3126-
markVarForSelectPriv(pstate, varnode, rte);
3124+
markVarForSelectPriv(pstate, varnode);
31273125
}
31283126

31293127
Assert(name == NULL && var == NULL); /* lists not the same length? */

‎src/backend/parser/parse_target.c

Copy file name to clipboardExpand all lines: src/backend/parser/parse_target.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1397,7 +1397,7 @@ ExpandSingleTable(ParseState *pstate, ParseNamespaceItem *nsitem,
13971397
{
13981398
Var *var = (Var *) lfirst(l);
13991399

1400-
markVarForSelectPriv(pstate, var, rte);
1400+
markVarForSelectPriv(pstate, var);
14011401
}
14021402

14031403
return vars;

‎src/include/parser/parse_relation.h

Copy file name to clipboardExpand all lines: src/include/parser/parse_relation.h
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ extern Node *scanNSItemForColumn(ParseState *pstate, ParseNamespaceItem *nsitem,
4141
int location);
4242
extern Node *colNameToVar(ParseState *pstate, const char *colname, bool localonly,
4343
int location);
44-
extern void markVarForSelectPriv(ParseState *pstate, Var *var,
45-
RangeTblEntry *rte);
44+
extern void markVarForSelectPriv(ParseState *pstate, Var *var);
4645
extern Relation parserOpenTable(ParseState *pstate, const RangeVar *relation,
4746
int lockmode);
4847
extern ParseNamespaceItem *addRangeTableEntry(ParseState *pstate,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.