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 1b9f3d117dbd9664f4e2e88977414dda39165c5e..14ce823ffc736d9e53028f9ebebcb82dd060567e 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 e66909e36c337a3c2778c2f7f152457fb445d700..f1d879c0873397e450c12c0120fa7edd1ba1b085 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;