diff options
| -rw-r--r-- | src/backend/catalog/aclchk.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/acl.c | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/privileges.out | 9 | ||||
| -rw-r--r-- | src/test/regress/sql/privileges.sql | 4 |
4 files changed, 0 insertions, 21 deletions
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index a44ccee3b68..d2abc48fd8d 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -2641,8 +2641,6 @@ string_to_privilege(const char *privname) return ACL_ALTER_SYSTEM; if (strcmp(privname, "maintain") == 0) return ACL_MAINTAIN; - if (strcmp(privname, "rule") == 0) - return 0; /* ignore old RULE privileges */ ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("unrecognized privilege type \"%s\"", privname))); diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index d7b39140b3d..4ad222b8d10 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -341,9 +341,6 @@ aclparse(const char *s, AclItem *aip, Node *escontext) case ACL_MAINTAIN_CHR: read = ACL_MAINTAIN; break; - case 'R': /* ignore old RULE privileges */ - read = 0; - break; default: ereturn(escontext, NULL, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), @@ -1639,7 +1636,6 @@ makeaclitem(PG_FUNCTION_ARGS) {"SET", ACL_SET}, {"ALTER SYSTEM", ACL_ALTER_SYSTEM}, {"MAINTAIN", ACL_MAINTAIN}, - {"RULE", 0}, /* ignore old RULE privileges */ {NULL, 0} }; @@ -2063,8 +2059,6 @@ convert_table_priv_string(text *priv_type_text) {"TRIGGER WITH GRANT OPTION", ACL_GRANT_OPTION_FOR(ACL_TRIGGER)}, {"MAINTAIN", ACL_MAINTAIN}, {"MAINTAIN WITH GRANT OPTION", ACL_GRANT_OPTION_FOR(ACL_MAINTAIN)}, - {"RULE", 0}, /* ignore old RULE privileges */ - {"RULE WITH GRANT OPTION", 0}, {NULL, 0} }; diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out index fab0cc800fc..430f0971149 100644 --- a/src/test/regress/expected/privileges.out +++ b/src/test/regress/expected/privileges.out @@ -1422,15 +1422,6 @@ from (select oid from pg_roles where rolname = current_user) as t2; t (1 row) --- 'rule' privilege no longer exists, but for backwards compatibility --- has_table_privilege still recognizes the keyword and says FALSE -select has_table_privilege(current_user,t1.oid,'rule') -from (select oid from pg_class where relname = 'pg_authid') as t1; - has_table_privilege ---------------------- - f -(1 row) - select has_table_privilege(current_user,t1.oid,'references') from (select oid from pg_class where relname = 'pg_authid') as t1; has_table_privilege diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql index ae338e8cc8e..e55b32f9d45 100644 --- a/src/test/regress/sql/privileges.sql +++ b/src/test/regress/sql/privileges.sql @@ -1004,10 +1004,6 @@ from (select oid from pg_roles where rolname = current_user) as t2; select has_table_privilege(t2.oid,'pg_authid','delete') from (select oid from pg_roles where rolname = current_user) as t2; --- 'rule' privilege no longer exists, but for backwards compatibility --- has_table_privilege still recognizes the keyword and says FALSE -select has_table_privilege(current_user,t1.oid,'rule') -from (select oid from pg_class where relname = 'pg_authid') as t1; select has_table_privilege(current_user,t1.oid,'references') from (select oid from pg_class where relname = 'pg_authid') as t1; |