diff options
| author | Amit Langote <amitlan@postgresql.org> | 2023-06-13 12:52:47 +0900 |
|---|---|---|
| committer | Amit Langote <amitlan@postgresql.org> | 2023-06-14 12:00:10 +0900 |
| commit | 0f8cfaf8921fed35f0b92d918ce95eec7b46ff05 (patch) | |
| tree | bab872e8982f9a5ed3e119a0bc77a7996858a887 /src/backend/executor/execMain.c | |
| parent | ae66716bf3ef6fa9b33904eaf15441813a150320 (diff) | |
| download | postgresql-0f8cfaf8921fed35f0b92d918ce95eec7b46ff05.tar.gz postgresql-0f8cfaf8921fed35f0b92d918ce95eec7b46ff05.zip | |
Retain relkind too in RTE_SUBQUERY entries for views.
47bb9db75 modified the ApplyRetrieveRule()'s conversion of a view's
original RTE_RELATION entry into an RTE_SUBQUERY one to retain relid,
rellockmode, and perminfoindex so that the executor can lock the view
and check its permissions. It seems better to also retain
relkind for cross-checking that the exception of an
RTE_SUBQUERY entry being allowed to carry relation details only
applies to views, so do so.
Bump catversion because this changes the output format of
RTE_SUBQUERY RTEs.
Suggested-by: David Steele <david@pgmasters.net>
Reviewed-by: David Steele <david@pgmasters.net>
Reviewed-by: Álvaro Herrera <alvherre@alvh.no-ip.org>
Discussion: https://postgr.es/m/3953179e-9540-e5d1-a743-4bef368785b0%40pgmasters.net
Diffstat (limited to 'src/backend/executor/execMain.c')
| -rw-r--r-- | src/backend/executor/execMain.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index c76fdf59ec4..4c5a7bbf620 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -595,6 +595,15 @@ ExecCheckPermissions(List *rangeTable, List *rteperminfos, if (rte->perminfoindex != 0) { /* Sanity checks */ + + /* + * Only relation RTEs and subquery RTEs that were once relation + * RTEs (views) have their perminfoindex set. + */ + Assert(rte->rtekind == RTE_RELATION || + (rte->rtekind == RTE_SUBQUERY && + rte->relkind == RELKIND_VIEW)); + (void) getRTEPermissionInfo(rteperminfos, rte); /* Many-to-one mapping not allowed */ Assert(!bms_is_member(rte->perminfoindex, indexset)); |