diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 00:15:29.129206400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 00:22:46.989832200 +0000
@@ -73,68 +73,9 @@
   (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
-                        obj                         | grantor  |        grantee         | privilege_type | is_grantable 
-----------------------------------------------------+----------+------------------------+----------------+--------------
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
- sequence regress_pg_dump_schema.test_seq           | postgres | regress_dump_test_role | USAGE          | f
- sequence regress_pg_dump_seq                       | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_seq                       | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_seq                       | postgres | postgres               | USAGE          | f
- sequence regress_pg_dump_seq                       | postgres | regress_dump_test_role | USAGE          | f
- sequence regress_seq_dumpable                      | postgres | postgres               | SELECT         | f
- sequence regress_seq_dumpable                      | postgres | postgres               | UPDATE         | f
- sequence regress_seq_dumpable                      | postgres | postgres               | USAGE          | f
- sequence regress_seq_dumpable                      | postgres | -                      | SELECT         | f
- sequence wgo_then_regular                          | postgres | postgres               | SELECT         | f
- sequence wgo_then_regular                          | postgres | postgres               | UPDATE         | f
- sequence wgo_then_regular                          | postgres | postgres               | USAGE          | f
- sequence wgo_then_regular                          | postgres | pg_signal_backend      | SELECT         | f
- sequence wgo_then_regular                          | postgres | pg_signal_backend      | UPDATE         | t
- sequence wgo_then_regular                          | postgres | pg_signal_backend      | USAGE          | t
- table regress_pg_dump_schema.test_table            | postgres | postgres               | INSERT         | f
- table regress_pg_dump_schema.test_table            | postgres | postgres               | SELECT         | f
- table regress_pg_dump_schema.test_table            | postgres | postgres               | UPDATE         | f
- table regress_pg_dump_schema.test_table            | postgres | postgres               | DELETE         | f
- table regress_pg_dump_schema.test_table            | postgres | postgres               | TRUNCATE       | f
- table regress_pg_dump_schema.test_table            | postgres | postgres               | REFERENCES     | f
- table regress_pg_dump_schema.test_table            | postgres | postgres               | TRIGGER        | f
- table regress_pg_dump_schema.test_table            | postgres | postgres               | MAINTAIN       | f
- table regress_pg_dump_schema.test_table            | postgres | regress_dump_test_role | SELECT         | f
- table regress_pg_dump_table                        | postgres | postgres               | INSERT         | f
- table regress_pg_dump_table                        | postgres | postgres               | SELECT         | f
- table regress_pg_dump_table                        | postgres | postgres               | UPDATE         | f
- table regress_pg_dump_table                        | postgres | postgres               | DELETE         | f
- table regress_pg_dump_table                        | postgres | postgres               | TRUNCATE       | f
- table regress_pg_dump_table                        | postgres | postgres               | REFERENCES     | f
- table regress_pg_dump_table                        | postgres | postgres               | TRIGGER        | f
- table regress_pg_dump_table                        | postgres | postgres               | MAINTAIN       | f
- table regress_pg_dump_table                        | postgres | regress_dump_test_role | SELECT         | f
- table regress_table_dumpable                       | postgres | postgres               | INSERT         | f
- table regress_table_dumpable                       | postgres | postgres               | SELECT         | f
- table regress_table_dumpable                       | postgres | postgres               | UPDATE         | f
- table regress_table_dumpable                       | postgres | postgres               | DELETE         | f
- table regress_table_dumpable                       | postgres | postgres               | TRUNCATE       | f
- table regress_table_dumpable                       | postgres | postgres               | REFERENCES     | f
- table regress_table_dumpable                       | postgres | postgres               | TRIGGER        | f
- table regress_table_dumpable                       | postgres | postgres               | MAINTAIN       | f
- table regress_table_dumpable                       | postgres | -                      | SELECT         | f
- type regress_pg_dump_schema.test_type              | postgres | -                      | USAGE          | f
- type regress_pg_dump_schema.test_type              | postgres | postgres               | USAGE          | f
- type regress_pg_dump_schema.test_type              | postgres | regress_dump_test_role | USAGE          | f
-(58 rows)
-
+ERROR:  role "postgres" does not exist
+LINE 2: ...WHEN a.grantor::regrole::name = current_user THEN 'postgres'
+                                                             ^
 SELECT pg_describe_object(classid,objid,objsubid) AS obj,
   pg_describe_object(refclassid,refobjid,0) AS refobj,
   deptype
@@ -145,8 +86,8 @@
 ----------------------------------------------------+-----------------------------+---------
  column c1 of foreign table ft1                     | role regress_dump_test_role | a
  column c1 of table test_pg_dump_t1                 | role regress_dump_test_role | a
- foreign table ft1                                  | role regress_dump_test_role | a
  foreign-data wrapper dummy                         | role regress_dump_test_role | a
+ foreign table ft1                                  | role regress_dump_test_role | a
  function regress_pg_dump_schema.test_agg(smallint) | role regress_dump_test_role | a
  function regress_pg_dump_schema.test_agg(smallint) | role regress_dump_test_role | i
  function regress_pg_dump_schema.test_func()        | role regress_dump_test_role | a
@@ -210,61 +151,9 @@
   (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
-                        obj                         | grantor  |      grantee      | privilege_type | is_grantable 
-----------------------------------------------------+----------+-------------------+----------------+--------------
- column col1 of table regress_pg_dump_table         | postgres | -                 | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                 | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres          | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                 | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres          | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                 | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres          | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres          | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres          | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres          | USAGE          | f
- sequence regress_pg_dump_seq                       | postgres | postgres          | SELECT         | f
- sequence regress_pg_dump_seq                       | postgres | postgres          | UPDATE         | f
- sequence regress_pg_dump_seq                       | postgres | postgres          | USAGE          | f
- sequence regress_seq_dumpable                      | postgres | postgres          | SELECT         | f
- sequence regress_seq_dumpable                      | postgres | postgres          | UPDATE         | f
- sequence regress_seq_dumpable                      | postgres | postgres          | USAGE          | f
- sequence regress_seq_dumpable                      | postgres | -                 | SELECT         | f
- sequence wgo_then_regular                          | postgres | postgres          | SELECT         | f
- sequence wgo_then_regular                          | postgres | postgres          | UPDATE         | f
- sequence wgo_then_regular                          | postgres | postgres          | USAGE          | f
- sequence wgo_then_regular                          | postgres | pg_signal_backend | SELECT         | f
- sequence wgo_then_regular                          | postgres | pg_signal_backend | UPDATE         | t
- sequence wgo_then_regular                          | postgres | pg_signal_backend | USAGE          | t
- table regress_pg_dump_schema.test_table            | postgres | postgres          | INSERT         | f
- table regress_pg_dump_schema.test_table            | postgres | postgres          | SELECT         | f
- table regress_pg_dump_schema.test_table            | postgres | postgres          | UPDATE         | f
- table regress_pg_dump_schema.test_table            | postgres | postgres          | DELETE         | f
- table regress_pg_dump_schema.test_table            | postgres | postgres          | TRUNCATE       | f
- table regress_pg_dump_schema.test_table            | postgres | postgres          | REFERENCES     | f
- table regress_pg_dump_schema.test_table            | postgres | postgres          | TRIGGER        | f
- table regress_pg_dump_schema.test_table            | postgres | postgres          | MAINTAIN       | f
- table regress_pg_dump_table                        | postgres | postgres          | INSERT         | f
- table regress_pg_dump_table                        | postgres | postgres          | SELECT         | f
- table regress_pg_dump_table                        | postgres | postgres          | UPDATE         | f
- table regress_pg_dump_table                        | postgres | postgres          | DELETE         | f
- table regress_pg_dump_table                        | postgres | postgres          | TRUNCATE       | f
- table regress_pg_dump_table                        | postgres | postgres          | REFERENCES     | f
- table regress_pg_dump_table                        | postgres | postgres          | TRIGGER        | f
- table regress_pg_dump_table                        | postgres | postgres          | MAINTAIN       | f
- table regress_table_dumpable                       | postgres | postgres          | INSERT         | f
- table regress_table_dumpable                       | postgres | postgres          | SELECT         | f
- table regress_table_dumpable                       | postgres | postgres          | UPDATE         | f
- table regress_table_dumpable                       | postgres | postgres          | DELETE         | f
- table regress_table_dumpable                       | postgres | postgres          | TRUNCATE       | f
- table regress_table_dumpable                       | postgres | postgres          | REFERENCES     | f
- table regress_table_dumpable                       | postgres | postgres          | TRIGGER        | f
- table regress_table_dumpable                       | postgres | postgres          | MAINTAIN       | f
- table regress_table_dumpable                       | postgres | -                 | SELECT         | f
- type regress_pg_dump_schema.test_type              | postgres | -                 | USAGE          | f
- type regress_pg_dump_schema.test_type              | postgres | postgres          | USAGE          | f
-(51 rows)
-
+ERROR:  role "postgres" does not exist
+LINE 2: ...WHEN a.grantor::regrole::name = current_user THEN 'postgres'
+                                                             ^
 SELECT pg_describe_object(classid,objid,objsubid) AS obj,
   pg_describe_object(refclassid,refobjid,0) AS refobj,
   deptype