summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2025-08-23 16:46:20 -0700
committerNoah Misch <noah@leadboat.com>2025-08-23 16:46:25 -0700
commit090c9c9608b3bf84987ff8403d86a52001989f7d (patch)
tree8e2c38d45cc2eb685c4ae1218e85cb75ca85e2aa
parentfbf967e996ddb6ce32983479236339ac3c7e1ce6 (diff)
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
-rw-r--r--src/test/regress/expected/privileges.out4
-rw-r--r--src/test/regress/sql/privileges.sql4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 1e301270aea..de97bd2ead2 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -2636,9 +2636,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 9a6b70b5b73..341b23b0bf8 100644
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -1663,9 +1663,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