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.GB3777719@rfd.leadboat.com

diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 80a604c4251045c6220a45fc6ae844f1dec9818d..46f11c241fff11d5e4b197dd1c68e3863829264e 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 regress_user1 NOINHERIT;
+SET SESSION AUTHORIZATION regress_user1;
 DELETE FROM atest3;
-ERROR:  permission denied for table atest3
+ERROR:  permission denied for relation atest3
 ROLLBACK;
 -- views
 SET SESSION AUTHORIZATION regress_user3;

diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index b7bb9d934df136d1b12d01b385460d80c990894d..968704a8f55fbb8c9a0dcb397e131421db6c432f 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 regress_user1 NOINHERIT;
+SET SESSION AUTHORIZATION regress_user1;
 DELETE FROM atest3;
 ROLLBACK;