postgres
diff --git a/‎src/backend/catalog/aclchk.c
Copy file name to clipboardExpand all lines: src/backend/catalog/aclchk.c
+3Lines changed: 3 additions & 0 deletions b/‎src/backend/catalog/aclchk.c
Copy file name to clipboardExpand all lines: src/backend/catalog/aclchk.c
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/test/regress/expected/privileges.out
Copy file name to clipboardExpand all lines: src/test/regress/expected/privileges.out
+2-1Lines changed: 2 additions & 1 deletion b/‎src/test/regress/expected/privileges.out
Copy file name to clipboardExpand all lines: src/test/regress/expected/privileges.out
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/test/regress/sql/privileges.sql
Copy file name to clipboardExpand all lines: src/test/regress/sql/privileges.sql
+2-1Lines changed: 2 additions & 1 deletion b/‎src/test/regress/sql/privileges.sql
Copy file name to clipboardExpand all lines: src/test/regress/sql/privileges.sql
+2-1Lines changed: 2 additions & 1 deletion
@@ -1312,6 +1312,9 @@ SetDefaultACL(InternalDefaultACL *iacls)
 		ReleaseSysCache(tuple);
 
 	heap_close(rel, RowExclusiveLock);
+
+	/* prevent error when processing duplicate objects */
+	CommandCounterIncrement();
 }
 
 
 
@@ -1562,7 +1562,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 
 ---------------------
 
@@ -933,7 +933,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
Original file line number	Diff line number	Diff line change
`@@ -1312,6 +1312,9 @@ SetDefaultACL(InternalDefaultACL *iacls)`
`1312`	`1312`	`ReleaseSysCache(tuple);`
`1313`	`1313`
`1314`	`1314`	`heap_close(rel, RowExclusiveLock);`
	`1315`	`+`
	`1316`	`+ /* prevent error when processing duplicate objects */`
	`1317`	`+ CommandCounterIncrement();`
`1315`	`1318`	`}`
`1316`	`1319`
`1317`	`1320`