Remove direct call to GetNewObjectId() for pg_auth_members.oid

michaelpq · michaelpq · commit eae7fe485998 · 2022-12-12T09:01:39.000+09:00
This routine should not be called directly as mentioned at its top, so replace it by GetNewOidWithIndex(). Issue introduced by 6566133 when pg_auth_members.oid got added, so no backpatch is needed. Author: Maciek Sakrejda Discussion: https://postgr.es/m/CAOtHd0Ckbih7Ur7XeVyLAJ26VZOfTNcq9qV403bNF4uTGtAN+Q@mail.gmail.com
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
@@ -1850,7 +1850,8 @@ AddRoleMems(const char *rolename, Oid roleid,
 			}
 
 			/* get an OID for the new row and insert it */
-			objectId = GetNewObjectId();
+			objectId = GetNewOidWithIndex(pg_authmem_rel, AuthMemOidIndexId,
+										  Anum_pg_auth_members_oid);
 			new_record[Anum_pg_auth_members_oid - 1] = objectId;
 			tuple = heap_form_tuple(pg_authmem_dsc,
 									new_record, new_record_nulls);

Original file line number	Diff line number	Diff line change
`@@ -1850,7 +1850,8 @@ AddRoleMems(const char *rolename, Oid roleid,`
`1850`	`1850`	`}`
`1851`	`1851`
`1852`	`1852`	`/* get an OID for the new row and insert it */`
`1853`		`- objectId = GetNewObjectId();`
	`1853`	`+ objectId = GetNewOidWithIndex(pg_authmem_rel, AuthMemOidIndexId,`
	`1854`	`+ Anum_pg_auth_members_oid);`
`1854`	`1855`	`new_record[Anum_pg_auth_members_oid - 1] = objectId;`
`1855`	`1856`	`tuple = heap_form_tuple(pg_authmem_dsc,`
`1856`	`1857`	`new_record, new_record_nulls);`