Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd12b4ba

Browse files
committed
Fix one more portability shortcoming in new test_pg_dump test.
If the bootstrap superuser's name requires quoting, regroleoutwill supply double quotes ... but the result of CURRENT_USERis just the literal name. Apply quote_ident() to ensure a match.Per Andrew Dunstan's off-list investigation of buildfarm memberprion's failures.
1 parentf6ab942 commitd12b4ba

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎src/test/modules/test_pg_dump/expected/test_pg_dump.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ GRANT USAGE ON SCHEMA test_pg_dump_s1 TO regress_dump_test_role;
6464
GRANT USAGE ON TYPE test_pg_dump_e1 TO regress_dump_test_role;
6565
-- Substitute for current user's name to keep test output consistent
6666
SELECT s.obj,
67-
CASE WHEN a.grantor::regrole::name = current_user THEN 'postgres'
67+
CASE WHEN a.grantor::regrole::name =quote_ident(current_user) THEN 'postgres'
6868
ELSE a.grantor::regrole::name END,
69-
CASE WHEN a.grantee::regrole::name = current_user THEN 'postgres'
69+
CASE WHEN a.grantee::regrole::name =quote_ident(current_user) THEN 'postgres'
7070
ELSE a.grantee::regrole::name END,
7171
a.privilege_type, a.is_grantable
7272
FROM
@@ -201,9 +201,9 @@ ALTER EXTENSION test_pg_dump DROP VIEW test_pg_dump_v1;
201201
DROP OWNED BY regress_dump_test_role RESTRICT;
202202
-- Substitute for current user's name to keep test output consistent
203203
SELECT s.obj,
204-
CASE WHEN a.grantor::regrole::name = current_user THEN 'postgres'
204+
CASE WHEN a.grantor::regrole::name =quote_ident(current_user) THEN 'postgres'
205205
ELSE a.grantor::regrole::name END,
206-
CASE WHEN a.grantee::regrole::name = current_user THEN 'postgres'
206+
CASE WHEN a.grantee::regrole::name =quote_ident(current_user) THEN 'postgres'
207207
ELSE a.grantee::regrole::name END,
208208
a.privilege_type, a.is_grantable
209209
FROM

‎src/test/modules/test_pg_dump/sql/test_pg_dump.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ GRANT USAGE ON TYPE test_pg_dump_e1 TO regress_dump_test_role;
7777

7878
-- Substitute for current user's name to keep test output consistent
7979
SELECTs.obj,
80-
CASE WHENa.grantor::regrole::name=current_user THEN'postgres'
80+
CASE WHENa.grantor::regrole::name=quote_ident(current_user) THEN'postgres'
8181
ELSEa.grantor::regrole::name END,
82-
CASE WHENa.grantee::regrole::name=current_user THEN'postgres'
82+
CASE WHENa.grantee::regrole::name=quote_ident(current_user) THEN'postgres'
8383
ELSEa.grantee::regrole::name END,
8484
a.privilege_type,a.is_grantable
8585
FROM
@@ -129,9 +129,9 @@ DROP OWNED BY regress_dump_test_role RESTRICT;
129129

130130
-- Substitute for current user's name to keep test output consistent
131131
SELECTs.obj,
132-
CASE WHENa.grantor::regrole::name=current_user THEN'postgres'
132+
CASE WHENa.grantor::regrole::name=quote_ident(current_user) THEN'postgres'
133133
ELSEa.grantor::regrole::name END,
134-
CASE WHENa.grantee::regrole::name=current_user THEN'postgres'
134+
CASE WHENa.grantee::regrole::name=quote_ident(current_user) THEN'postgres'
135135
ELSEa.grantee::regrole::name END,
136136
a.privilege_type,a.is_grantable
137137
FROM

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp