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

diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index ffaceb93644cf0aea7df311c895e56d9fd20517b..fecf80d295377aac450cd9047f71f4eb6807a049 100644 (file)
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -417,6 +417,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 cf5f9fd6aa14fc8788cd80098b89a5d261977a06..697fd9d43d66afe22a03ecb77c86e3c89c7b9b38 100644 (file)
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -2825,6 +2825,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 e93b179b4295743abae3ffa5dfcb8d1f594ef4d8..d964d91ebf01130c755007e94257f658c82814de 100644 (file)
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -1764,6 +1764,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);