From 34829da58cdde613899fe01d1e9ceecd2815eac7 Mon Sep 17 00:00:00 2001 From: reshke Date: Sun, 10 Aug 2025 11:34:37 +0000 Subject: [PATCH v3] Handle DEFAULT ACL case in DOTypeNameCompare function Previously, default acl objects used to be sorted by OID in pg_dump output. Since 0decd5e this is considered as bad pratice, so compare them by defaclrole. --- src/bin/pg_dump/pg_dump_sort.c | 10 ++++++++++ src/test/regress/expected/privileges.out | 3 +++ src/test/regress/sql/privileges.sql | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c index a02da3e9652..08667e95a40 100644 --- a/src/bin/pg_dump/pg_dump_sort.c +++ b/src/bin/pg_dump/pg_dump_sort.c @@ -440,6 +440,16 @@ DOTypeNameCompare(const void *p1, const void *p2) if (cmpval != 0) return cmpval; } + else if (obj1->objType == DO_DEFAULT_ACL) + { + DefaultACLInfo *daclobj1 = *(DefaultACLInfo *const *) p1; + DefaultACLInfo *daclobj2 = *(DefaultACLInfo *const *) p2; + + /* Sort by defaclrole */ + cmpval = strcmp(daclobj1->defaclrole, daclobj2->defaclrole); + if (cmpval != 0) + return cmpval; + } /* * Shouldn't get here except after catalog corruption, but if we do, sort diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out index 602a6b255bc..ad9a0c22188 100644 --- a/src/test/regress/expected/privileges.out +++ b/src/test/regress/expected/privileges.out @@ -3448,6 +3448,9 @@ DROP SCHEMA reindex_test; DROP ROLE regress_no_maintain; DROP ROLE regress_maintain; DROP ROLE regress_maintain_all; +-- 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; -- grantor selection CREATE ROLE regress_grantor1; CREATE ROLE regress_grantor2 ROLE regress_grantor1; diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql index 3eacc1340aa..f4a4701c6c8 100644 --- a/src/test/regress/sql/privileges.sql +++ b/src/test/regress/sql/privileges.sql @@ -2095,6 +2095,10 @@ DROP ROLE regress_no_maintain; DROP ROLE regress_maintain; DROP ROLE regress_maintain_all; +-- 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; + -- grantor selection CREATE ROLE regress_grantor1; CREATE ROLE regress_grantor2 ROLE regress_grantor1; -- 2.43.0