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
@@ -1365,6 +1365,9 @@ SetDefaultACL(InternalDefaultACL *iacls)
 		ReleaseSysCache(tuple);
 
 	table_close(rel, RowExclusiveLock);
+
+	/* prevent error when processing duplicate objects */
+	CommandCounterIncrement();
 }
 
 
 
@@ -1649,7 +1649,8 @@ SELECT has_table_privilege('regress_priv_user1', 'testns.acltest1', 'INSERT'); -
  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_priv_user1', 'testns.acltest1', 'SELECT'); -- no
  has_table_privilege 
 ---------------------
 
@@ -985,7 +985,8 @@ CREATE TABLE testns.acltest1 (x int);
 SELECT has_table_privilege('regress_priv_user1', 'testns.acltest1', 'SELECT'); -- no
 SELECT has_table_privilege('regress_priv_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_priv_user1', 'testns.acltest1', 'SELECT'); -- no
 SELECT has_table_privilege('regress_priv_user1', 'testns.acltest1', 'INSERT'); -- no
Original file line number	Diff line number	Diff line change
`@@ -1365,6 +1365,9 @@ SetDefaultACL(InternalDefaultACL *iacls)`
`1365`	`1365`	`ReleaseSysCache(tuple);`
`1366`	`1366`
`1367`	`1367`	`table_close(rel, RowExclusiveLock);`
	`1368`	`+`
	`1369`	`+ /* prevent error when processing duplicate objects */`
	`1370`	`+ CommandCounterIncrement();`
`1368`	`1371`	`}`
`1369`	`1372`
`1370`	`1373`