From: Noah Misch Date: Sat, 23 Aug 2025 23:46:20 +0000 (-0700) Subject: Rewrite previous commit's test for TestUpgradeXversion compatibility. X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;ds=sidebyside;p=postgresql.git 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 8149666725b..6dcc95ede50 100644 --- 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 7b1e9393577..fe409654c0e 100644 --- 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