Fix one more portability shortcoming in new test_pg_dump test.

tglsfdc · tglsfdc · commit d12b4ba1bd3e · 2024-04-30T10:45:14.000-04:00
If the bootstrap superuser's name requires quoting, regroleout
will supply double quotes ... but the result of CURRENT_USER
is just the literal name.  Apply quote_ident() to ensure a match.

Per Andrew Dunstan's off-list investigation of buildfarm member
prion's failures.
diff --git a/src/test/modules/test_pg_dump/expected/test_pg_dump.out b/src/test/modules/test_pg_dump/expected/test_pg_dump.out
@@ -64,9 +64,9 @@ GRANT USAGE ON SCHEMA test_pg_dump_s1 TO regress_dump_test_role;
 GRANT USAGE ON TYPE test_pg_dump_e1 TO regress_dump_test_role;
 -- Substitute for current user's name to keep test output consistent
 SELECT s.obj,
-  CASE WHEN a.grantor::regrole::name = current_user THEN 'postgres'
+  CASE WHEN a.grantor::regrole::name = quote_ident(current_user) THEN 'postgres'
     ELSE a.grantor::regrole::name END,
-  CASE WHEN a.grantee::regrole::name = current_user THEN 'postgres'
+  CASE WHEN a.grantee::regrole::name = quote_ident(current_user) THEN 'postgres'
     ELSE a.grantee::regrole::name END,
   a.privilege_type, a.is_grantable
 FROM
@@ -201,9 +201,9 @@ ALTER EXTENSION test_pg_dump DROP VIEW test_pg_dump_v1;
 DROP OWNED BY regress_dump_test_role RESTRICT;
 -- Substitute for current user's name to keep test output consistent
 SELECT s.obj,
-  CASE WHEN a.grantor::regrole::name = current_user THEN 'postgres'
+  CASE WHEN a.grantor::regrole::name = quote_ident(current_user) THEN 'postgres'
     ELSE a.grantor::regrole::name END,
-  CASE WHEN a.grantee::regrole::name = current_user THEN 'postgres'
+  CASE WHEN a.grantee::regrole::name = quote_ident(current_user) THEN 'postgres'
     ELSE a.grantee::regrole::name END,
   a.privilege_type, a.is_grantable
 FROM
diff --git a/src/test/modules/test_pg_dump/sql/test_pg_dump.sql b/src/test/modules/test_pg_dump/sql/test_pg_dump.sql
@@ -77,9 +77,9 @@ GRANT USAGE ON TYPE test_pg_dump_e1 TO regress_dump_test_role;
 
 -- Substitute for current user's name to keep test output consistent
 SELECT s.obj,
-  CASE WHEN a.grantor::regrole::name = current_user THEN 'postgres'
+  CASE WHEN a.grantor::regrole::name = quote_ident(current_user) THEN 'postgres'
     ELSE a.grantor::regrole::name END,
-  CASE WHEN a.grantee::regrole::name = current_user THEN 'postgres'
+  CASE WHEN a.grantee::regrole::name = quote_ident(current_user) THEN 'postgres'
     ELSE a.grantee::regrole::name END,
   a.privilege_type, a.is_grantable
 FROM
@@ -129,9 +129,9 @@ DROP OWNED BY regress_dump_test_role RESTRICT;
 
 -- Substitute for current user's name to keep test output consistent
 SELECT s.obj,
-  CASE WHEN a.grantor::regrole::name = current_user THEN 'postgres'
+  CASE WHEN a.grantor::regrole::name = quote_ident(current_user) THEN 'postgres'
     ELSE a.grantor::regrole::name END,
-  CASE WHEN a.grantee::regrole::name = current_user THEN 'postgres'
+  CASE WHEN a.grantee::regrole::name = quote_ident(current_user) THEN 'postgres'
     ELSE a.grantee::regrole::name END,
   a.privilege_type, a.is_grantable
 FROM
