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 c394e4f70b5eeccfbe9666efe9d29b4190aaf743..a8997a3eea5d47a2e67df3591536b6d7bae4f6ec 100644 (file)
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -3155,9 +3155,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 5da76475a86a70b3886c73b4b62e7ab279eead5e..e3f047fff1946a215146d11c969d6d775976768d 100644 (file)
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -1865,9 +1865,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