postgres.git / summary / log / commit / refs

commit    4948bb9df4210e30492caf3fa4e982bac376fd0b
Author:   Noah Misch <noah@leadboat.com>
Date:     Sat Aug 23 03:50:28 2025 +0000

    Sort DO_DEFAULT_ACL dump objects independent of OIDs.
    
    Commit 0decd5e89db9f5edb9b27351082f0d74aae7a9b6 missed DO_DEFAULT_ACL,
    leading to assertion failures, potential dump order instability, and
    spurious schema diffs.  Back-patch to v13, like that commit.
    
    Reported-by: Alexander Lakhin <exclusion@gmail.com>
    Author: Kirill Reshke <reshkekirill@gmail.com>
    Discussion: https://postgr.es/m/d32aaa8d-df7c-4f94-bcb3-4c85f02bea21@gmail.com
    Backpatch-through: 13


 src/bin/pg_dump/pg_dump_sort.c           | 13 +++++++++++++
 src/test/regress/expected/privileges.out |  5 +++++
 src/test/regress/sql/privileges.sql      |  7 +++++++
 3 files changed, 25 insertions(+)

diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 168e4a3dc75..6c44a8a910c 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -412,6 +412,19 @@ DOTypeNameCompare(const void *p1, const void *p2)
 				return cmpval;
 		}
 	}
+	else if (obj1->objType == DO_DEFAULT_ACL)
+	{
+		DefaultACLInfo *daclobj1 = *(DefaultACLInfo *const *) p1;
+		DefaultACLInfo *daclobj2 = *(DefaultACLInfo *const *) p2;
+
+		/*
+		 * Sort by defaclrole, per pg_default_acl_role_nsp_obj_index.  The
+		 * (namespace, name) match (defaclnamespace, defaclobjtype).
+		 */
+		cmpval = strcmp(daclobj1->defaclrole, daclobj2->defaclrole);
+		if (cmpval != 0)
+			return cmpval;
+	}
 	else if (obj1->objType == DO_PUBLICATION_REL)
 	{
 		PublicationRelInfo *probj1 = *(PublicationRelInfo *const *) p1;
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 08c6c3bc59a..543efe5cb87 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -2526,6 +2526,11 @@ DROP USER regress_priv_user6;
 DROP USER regress_priv_user7;
 DROP USER regress_priv_user8; -- does not exist
 ERROR:  role "regress_priv_user8" does not exist
+-- leave some default ACLs for pg_upgrade's dump-restore test input.
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_signal_backend
+	REVOKE INSERT ON TABLES FROM pg_signal_backend;
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_read_all_settings
+	REVOKE INSERT ON TABLES FROM pg_read_all_settings;
 -- permissions with LOCK TABLE
 CREATE USER regress_locktable_user;
 CREATE TABLE lock_table (a int);
diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index f351583a11e..bcc49e88e05 100644
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -1534,6 +1534,13 @@ DROP USER regress_priv_user7;
 DROP USER regress_priv_user8; -- does not exist
 
 
+-- leave some default ACLs for pg_upgrade's dump-restore test input.
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_signal_backend
+	REVOKE INSERT ON TABLES FROM pg_signal_backend;
+ALTER DEFAULT PRIVILEGES FOR ROLE pg_read_all_settings
+	REVOKE INSERT ON TABLES FROM pg_read_all_settings;
+
+
 -- permissions with LOCK TABLE
 CREATE USER regress_locktable_user;
 CREATE TABLE lock_table (a int);


[parent: 222130edd81f]