database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

Standardize pg_authid oid_symbol values.

Browse Source 
Commit c9c41c7a337d3e2deb0b2a193e9ecfb865d8f52b used two different
naming patterns.  Standardize on the majority pattern, which was the
only pattern in the last reviewed version of that commit.
This commit is contained in:
Noah Misch 2021-04-10 12:01:41 -07:00
parent 496e58bb0e
commit df5efaf441
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/catalog/aclchk.c
View File

@ -3931,7 +3931,7 @@ pg_class_aclmask_ext(Oid table_oid, Oid roleid, AclMode mask,
* pg_read_all_data role, which allows read access to all relations.
*/
if (mask & ACL_SELECT && !(result & ACL_SELECT) &&
has_privs_of_role(roleid, ROLE_READ_ALL_DATA))
has_privs_of_role(roleid, ROLE_PG_READ_ALL_DATA))
result |= ACL_SELECT;
/*
@ -3943,7 +3943,7 @@ pg_class_aclmask_ext(Oid table_oid, Oid roleid, AclMode mask,
*/
if (mask & (ACL_INSERT | ACL_UPDATE | ACL_DELETE) &&
!(result & (ACL_INSERT | ACL_UPDATE | ACL_DELETE)) &&
has_privs_of_role(roleid, ROLE_WRITE_ALL_DATA))
has_privs_of_role(roleid, ROLE_PG_WRITE_ALL_DATA))
result |= (mask & (ACL_INSERT | ACL_UPDATE | ACL_DELETE));
return result;
@ -4279,8 +4279,8 @@ pg_namespace_aclmask(Oid nsp_oid, Oid roleid,
* access to all schemas.
*/
if (mask & ACL_USAGE && !(result & ACL_USAGE) &&
(has_privs_of_role(roleid, ROLE_READ_ALL_DATA) ||
has_privs_of_role(roleid, ROLE_WRITE_ALL_DATA)))
(has_privs_of_role(roleid, ROLE_PG_READ_ALL_DATA) ||
has_privs_of_role(roleid, ROLE_PG_WRITE_ALL_DATA)))
result |= ACL_USAGE;
return result;
}

8
src/backend/commands/user.c
View File

@ -1501,10 +1501,10 @@ AddRoleMems(const char *rolename, Oid roleid,
* situation-dependent member. There's no technical need for this
* restriction. (One could lift it and take the further step of making
* pg_database_ownercheck() equivalent to has_privs_of_role(roleid,
* ROLE_DATABASE_OWNER), in which case explicit,
* situation-independent members could act as the owner of any database.)
* ROLE_PG_DATABASE_OWNER), in which case explicit, situation-independent
* members could act as the owner of any database.)
*/
if (roleid == ROLE_DATABASE_OWNER)
if (roleid == ROLE_PG_DATABASE_OWNER)
ereport(ERROR,
errmsg("role \"%s\" cannot have explicit members", rolename));
@ -1555,7 +1555,7 @@ AddRoleMems(const char *rolename, Oid roleid,
* shared object. (The effect of such ownership is that any owner of
* another database can act as the owner of affected shared objects.)
*/
if (memberid == ROLE_DATABASE_OWNER)
if (memberid == ROLE_PG_DATABASE_OWNER)
ereport(ERROR,
errmsg("role \"%s\" cannot be a member of any role",
get_rolespec_name(memberRole)));

6
src/backend/utils/adt/acl.c
View File

@ -4741,8 +4741,8 @@ roles_is_member_of(Oid roleid, enum RoleRecurseType type,
/*
* Role expansion happens in a non-database backend when guc.c checks
* ROLE_READ_ALL_SETTINGS for a physical walsender SHOW command.
* In that case, no role gets pg_database_owner.
* ROLE_PG_READ_ALL_SETTINGS for a physical walsender SHOW command. In
* that case, no role gets pg_database_owner.
*/
if (!OidIsValid(MyDatabaseId))
dba = InvalidOid;
@ -4808,7 +4808,7 @@ roles_is_member_of(Oid roleid, enum RoleRecurseType type,
/* implement pg_database_owner implicit membership */
if (memberid == dba && OidIsValid(dba))
roles_list = list_append_unique_oid(roles_list,
ROLE_DATABASE_OWNER);
ROLE_PG_DATABASE_OWNER);
}
/*

6
src/include/catalog/pg_authid.dat
View File

@ -24,17 +24,17 @@
rolcreaterole => 't', rolcreatedb => 't', rolcanlogin => 't',
rolreplication => 't', rolbypassrls => 't', rolconnlimit => '-1',
rolpassword => '_null_', rolvaliduntil => '_null_' },
{ oid => '8778', oid_symbol => 'ROLE_DATABASE_OWNER',
{ oid => '8778', oid_symbol => 'ROLE_PG_DATABASE_OWNER',
rolname => 'pg_database_owner', rolsuper => 'f', rolinherit => 't',
rolcreaterole => 'f', rolcreatedb => 'f', rolcanlogin => 'f',
rolreplication => 'f', rolbypassrls => 'f', rolconnlimit => '-1',
rolpassword => '_null_', rolvaliduntil => '_null_' },
{ oid => '9274', oid_symbol => 'ROLE_READ_ALL_DATA',
{ oid => '9274', oid_symbol => 'ROLE_PG_READ_ALL_DATA',
rolname => 'pg_read_all_data', rolsuper => 'f', rolinherit => 't',
rolcreaterole => 'f', rolcreatedb => 'f', rolcanlogin => 'f',
rolreplication => 'f', rolbypassrls => 'f', rolconnlimit => '-1',
rolpassword => '_null_', rolvaliduntil => '_null_' },
{ oid => '9275', oid_symbol => 'ROLE_WRITE_ALL_DATA',
{ oid => '9275', oid_symbol => 'ROLE_PG_WRITE_ALL_DATA',
rolname => 'pg_write_all_data', rolsuper => 'f', rolinherit => 't',
rolcreaterole => 'f', rolcreatedb => 'f', rolcanlogin => 'f',
rolreplication => 'f', rolbypassrls => 'f', rolconnlimit => '-1',