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

diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 13785add07f8b6098704a7faad2b6b00e50513cc..4befcb797dd46dadeaace13461ac568cbb5ed002 100644 (file)
--- 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 46f11c241fff11d5e4b197dd1c68e3863829264e..ada059244ac3b35ec77a770112e7db73df10c326 100644 (file)
--- 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 968704a8f55fbb8c9a0dcb397e131421db6c432f..7edfc28f845319cf452263cf17d6e3e5ec4b6c4a 100644 (file)
--- 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