diff options
| -rw-r--r-- | src/backend/commands/user.c | 11 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 2 | ||||
| -rw-r--r-- | src/test/regress/expected/privileges.out | 2 |
3 files changed, 0 insertions, 15 deletions
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index c8c0dd0dd5..aa69821be4 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -1259,18 +1259,7 @@ GrantRole(GrantRoleStmt *stmt) ListCell *item; if (stmt->grantor) - { grantor = get_rolespec_oid(stmt->grantor, false); - - /* - * Currently, this clause is only for SQL compatibility, not very - * interesting otherwise. - */ - if (grantor != GetUserId()) - ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("grantor must be current user"))); - } else grantor = GetUserId(); diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 3d4dd43e47..2a319eecda 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -7284,7 +7284,6 @@ RevokeRoleStmt: n->admin_opt = false; n->granted_roles = $2; n->grantee_roles = $4; - n->grantor = $5; n->behavior = $6; $$ = (Node*)n; } @@ -7295,7 +7294,6 @@ RevokeRoleStmt: n->admin_opt = true; n->granted_roles = $5; n->grantee_roles = $7; - n->grantor = $8; n->behavior = $9; $$ = (Node*)n; } diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out index 0bc79be03d..291e21d7a6 100644 --- a/src/test/regress/expected/privileges.out +++ b/src/test/regress/expected/privileges.out @@ -69,9 +69,7 @@ ALTER FUNCTION leak(integer,integer) OWNER TO regress_priv_user1; -- test owner privileges GRANT regress_priv_role TO regress_priv_user1 WITH ADMIN OPTION GRANTED BY CURRENT_ROLE; REVOKE ADMIN OPTION FOR regress_priv_role FROM regress_priv_user1 GRANTED BY foo; -- error -ERROR: role "foo" does not exist REVOKE ADMIN OPTION FOR regress_priv_role FROM regress_priv_user1 GRANTED BY regress_priv_user2; -- error -ERROR: grantor must be current user REVOKE ADMIN OPTION FOR regress_priv_role FROM regress_priv_user1 GRANTED BY CURRENT_USER; REVOKE regress_priv_role FROM regress_priv_user1 GRANTED BY CURRENT_ROLE; DROP ROLE regress_priv_role; |