Rewrite previous commit's test for TestUpgradeXversion compatibility.

v17 introduced the MAINTAIN ON TABLES privilege.  That changed the
applicable "baseacls" reaching buildACLCommands().  That yielded
spurious TestUpgradeXversion diffs.  Change to use a TYPES privilege.
Types have the same one privilege in all supported versions, so they
avoid the problem.  Per buildfarm.  Back-patch to v13, like that commit.

Discussion: https://postgr.es/m/20250823144505.88.nmisch@google.com
Backpatch-through: 13

diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 543efe5cb87fc48645d420f77122f5cd61adea28..06c99fd9e63f24ee07d6b2eea1d385886da27693 100644 (file)
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -2528,9 +2528,9 @@ 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;
+   REVOKE USAGE ON TYPES FROM pg_signal_backend;
 ALTER DEFAULT PRIVILEGES FOR ROLE pg_read_all_settings
-   REVOKE INSERT ON TABLES FROM pg_read_all_settings;
+   REVOKE USAGE ON TYPES 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 bcc49e88e054e95b453cd50409cd1cec8aa0f0cf..be14731ec24baa05f21843434fd2574e42b1cc4e 100644 (file)
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -1536,9 +1536,9 @@ 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;
+   REVOKE USAGE ON TYPES FROM pg_signal_backend;
 ALTER DEFAULT PRIVILEGES FOR ROLE pg_read_all_settings
-   REVOKE INSERT ON TABLES FROM pg_read_all_settings;
+   REVOKE USAGE ON TYPES FROM pg_read_all_settings;
 
 
 -- permissions with LOCK TABLE