Fix back-patch of "Invalidate acl.c caches when pg_authid changes."

Test script role names and error messages differed in v10, 9.6 and 9.5.

Discussion: https://postgr.es/m/20201221095028[email protected]

diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index f68210bcd21de2e27565cf17136bcc4d465be2a0..c1936bda0927255a7d4afdf3b852ade68dc87d55 100644 (file)
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -348,10 +348,10 @@ ERROR:  permission denied for relation atest3
 DELETE FROM atest3; -- ok
 BEGIN;
 RESET SESSION AUTHORIZATION;
-ALTER ROLE regress_priv_user1 NOINHERIT;
-SET SESSION AUTHORIZATION regress_priv_user1;
+ALTER ROLE regressuser1 NOINHERIT;
+SET SESSION AUTHORIZATION regressuser1;
 DELETE FROM atest3;
-ERROR:  permission denied for table atest3
+ERROR:  permission denied for relation atest3
 ROLLBACK;
 -- views
 SET SESSION AUTHORIZATION regressuser3;

diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index b31eb28cce3768957e5c79f9b1fcb976ed31aba0..6e9db844ad4d192d4fa9f547f7302970b8497457 100644 (file)
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -218,8 +218,8 @@ DELETE FROM atest3; -- ok
 
 BEGIN;
 RESET SESSION AUTHORIZATION;
-ALTER ROLE regress_priv_user1 NOINHERIT;
-SET SESSION AUTHORIZATION regress_priv_user1;
+ALTER ROLE regressuser1 NOINHERIT;
+SET SESSION AUTHORIZATION regressuser1;
 DELETE FROM atest3;
 ROLLBACK;