diff options
| author | Michael Paquier <michael@paquier.xyz> | 2021-01-20 11:39:24 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2021-01-20 11:39:24 +0900 |
| commit | 74ee3abcfefa6e6b0756f85baa31a7ae21bb2fec (patch) | |
| tree | e44e4cc9b6547aaf6ba50833481581302b1d212e | |
| parent | fac54bd5e216c18d921b7ba18b30e8f8139034b6 (diff) | |
Fix ALTER DEFAULT PRIVILEGES with duplicated objects
Specifying duplicated objects in this command would lead to unique
constraint violations in pg_default_acl or "tuple already updated by
self" errors. Similarly to GRANT/REVOKE, increment the command ID after
each subcommand processing to allow this case to work transparently.
A regression test is added by tweaking one of the existing queries of
privileges.sql to stress this case.
Reported-by: Andrus
Author: Michael Paquier
Reviewed-by: Álvaro Herrera
Discussion: https://postgr.es/m/ae2a7dc1-9d71-8cba-3bb9-e4cb7eb1f44e@hot.ee
Backpatch-through: 9.5
| -rw-r--r-- | src/backend/catalog/aclchk.c | 3 | ||||
| -rw-r--r-- | src/test/regress/expected/privileges.out | 3 | ||||
| -rw-r--r-- | src/test/regress/sql/privileges.sql | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 13785add07f..4befcb797dd 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -1328,6 +1328,9 @@ SetDefaultACL(InternalDefaultACL *iacls) ReleaseSysCache(tuple); heap_close(rel, RowExclusiveLock); + + /* prevent error when processing duplicate objects */ + CommandCounterIncrement(); } diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out index 46f11c241ff..ada059244ac 100644 --- a/src/test/regress/expected/privileges.out +++ b/src/test/regress/expected/privileges.out @@ -1581,7 +1581,8 @@ SELECT has_table_privilege('regress_user1', 'testns.acltest1', 'INSERT'); -- no f (1 row) -ALTER DEFAULT PRIVILEGES IN SCHEMA testns GRANT SELECT ON TABLES TO public; +-- placeholder for test with duplicated schema and role names +ALTER DEFAULT PRIVILEGES IN SCHEMA testns,testns GRANT SELECT ON TABLES TO public,public; SELECT has_table_privilege('regress_user1', 'testns.acltest1', 'SELECT'); -- no has_table_privilege --------------------- diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql index 968704a8f55..7edfc28f845 100644 --- a/src/test/regress/sql/privileges.sql +++ b/src/test/regress/sql/privileges.sql @@ -942,7 +942,8 @@ CREATE TABLE testns.acltest1 (x int); SELECT has_table_privilege('regress_user1', 'testns.acltest1', 'SELECT'); -- no SELECT has_table_privilege('regress_user1', 'testns.acltest1', 'INSERT'); -- no -ALTER DEFAULT PRIVILEGES IN SCHEMA testns GRANT SELECT ON TABLES TO public; +-- placeholder for test with duplicated schema and role names +ALTER DEFAULT PRIVILEGES IN SCHEMA testns,testns GRANT SELECT ON TABLES TO public,public; SELECT has_table_privilege('regress_user1', 'testns.acltest1', 'SELECT'); -- no SELECT has_table_privilege('regress_user1', 'testns.acltest1', 'INSERT'); -- no |