diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2023-06-13 15:58:37 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2023-06-13 15:58:37 -0400 |
commit | a36d0014f11fd0687f6adf7451f63550290a1de2 (patch) | |
tree | 0d9b4ab1b618387eb6bfd41892e42197b353bbba /src/backend/rewrite/rewriteHandler.c | |
parent | 6f23b5f74f5fd86d7bbadc89359b8f2175665400 (diff) |
Correctly update hasSubLinks while mutating a rule action.
rewriteRuleAction neglected to check for SubLink nodes in the
securityQuals of range table entries. This could lead to failing
to convert such a SubLink to a SubPlan, resulting in assertion
crashes or weird errors later in planning.
In passing, fix some poor coding in rewriteTargetView:
we should not pass the source parsetree's hasSubLinks
field to ReplaceVarsFromTargetList's outer_hasSubLinks.
ReplaceVarsFromTargetList knows enough to ignore that
when a Query node is passed, but it's still confusing
and bad precedent: if we did try to update that flag
we'd be updating a stale copy of the parsetree.
Per bug #17972 from Alexander Lakhin. This has been broken since
we added RangeTblEntry.securityQuals (although the presented test
case only fails back to 215b43cdc), so back-patch all the way.
Discussion: https://postgr.es/m/17972-f422c094237847d0@postgresql.org
Diffstat (limited to 'src/backend/rewrite/rewriteHandler.c')
-rw-r--r-- | src/backend/rewrite/rewriteHandler.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index f187ca7b92f..d22a5f75783 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -472,6 +472,8 @@ rewriteRuleAction(Query *parsetree, /* other RTE types don't contain bare expressions */ break; } + sub_action->hasSubLinks |= + checkExprHasSubLink((Node *) rte->securityQuals); if (sub_action->hasSubLinks) break; /* no need to keep scanning rtable */ } @@ -3269,7 +3271,7 @@ rewriteTargetView(Query *parsetree, Relation view) view_targetlist, REPLACEVARS_REPORT_ERROR, 0, - &parsetree->hasSubLinks); + NULL); /* * Update all other RTI references in the query that point to the view |