🌐 AI搜索 & 代理 主页
Skip to content

Commit 0c3fc09

Browse files
MasaoFujiiMasaoFujii
committed
postgres_fdw: Fix test failure with -DENFORCE_REGRESSION_TEST_NAME_RESTRICTIONS
The roles created by regression test should have names starting with "regress_", and the test introduced in commit 411ae64 did not do that. Per buildfarm member longfin. Discussion: https://postgr.es/m/73fc5ae4-3c54-1262-4533-f8c547de2e60@oss.nttdata.com
1 parent 6adc537 commit 0c3fc09

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎contrib/postgres_fdw/expected/postgres_fdw.out‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9267,21 +9267,21 @@ SELECT * FROM postgres_fdw_get_connections() ORDER BY 1;
92679267
-- =============================================================================
92689268
-- test case for having multiple cached connections for a foreign server
92699269
-- =============================================================================
9270-
CREATE ROLE multi_conn_user1 SUPERUSER;
9271-
CREATE ROLE multi_conn_user2 SUPERUSER;
9272-
CREATE USER MAPPING FOR multi_conn_user1 SERVER loopback;
9273-
CREATE USER MAPPING FOR multi_conn_user2 SERVER loopback;
9274-
-- Will cache loopback connection with user mapping for multi_conn_user1
9275-
SET ROLE multi_conn_user1;
9270+
CREATE ROLE regress_multi_conn_user1 SUPERUSER;
9271+
CREATE ROLE regress_multi_conn_user2 SUPERUSER;
9272+
CREATE USER MAPPING FOR regress_multi_conn_user1 SERVER loopback;
9273+
CREATE USER MAPPING FOR regress_multi_conn_user2 SERVER loopback;
9274+
-- Will cache loopback connection with user mapping for regress_multi_conn_user1
9275+
SET ROLE regress_multi_conn_user1;
92769276
SELECT 1 FROM ft1 LIMIT 1;
92779277
?column?
92789278
----------
92799279
1
92809280
(1 row)
92819281

92829282
RESET ROLE;
9283-
-- Will cache loopback connection with user mapping for multi_conn_user2
9284-
SET ROLE multi_conn_user2;
9283+
-- Will cache loopback connection with user mapping for regress_multi_conn_user2
9284+
SET ROLE regress_multi_conn_user2;
92859285
SELECT 1 FROM ft1 LIMIT 1;
92869286
?column?
92879287
----------
@@ -9312,10 +9312,10 @@ SELECT * FROM postgres_fdw_get_connections() ORDER BY 1;
93129312
(0 rows)
93139313

93149314
-- Clean up
9315-
DROP USER MAPPING FOR multi_conn_user1 SERVER loopback;
9316-
DROP USER MAPPING FOR multi_conn_user2 SERVER loopback;
9317-
DROP ROLE multi_conn_user1;
9318-
DROP ROLE multi_conn_user2;
9315+
DROP USER MAPPING FOR regress_multi_conn_user1 SERVER loopback;
9316+
DROP USER MAPPING FOR regress_multi_conn_user2 SERVER loopback;
9317+
DROP ROLE regress_multi_conn_user1;
9318+
DROP ROLE regress_multi_conn_user2;
93199319
-- ===================================================================
93209320
-- batch insert
93219321
-- ===================================================================

‎contrib/postgres_fdw/sql/postgres_fdw.sql‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2801,18 +2801,18 @@ SELECT * FROM postgres_fdw_get_connections() ORDER BY 1;
28012801
-- =============================================================================
28022802
-- test case for having multiple cached connections for a foreign server
28032803
-- =============================================================================
2804-
CREATE ROLE multi_conn_user1 SUPERUSER;
2805-
CREATE ROLE multi_conn_user2 SUPERUSER;
2806-
CREATE USER MAPPING FOR multi_conn_user1 SERVER loopback;
2807-
CREATE USER MAPPING FOR multi_conn_user2 SERVER loopback;
2804+
CREATE ROLE regress_multi_conn_user1 SUPERUSER;
2805+
CREATE ROLE regress_multi_conn_user2 SUPERUSER;
2806+
CREATE USER MAPPING FOR regress_multi_conn_user1 SERVER loopback;
2807+
CREATE USER MAPPING FOR regress_multi_conn_user2 SERVER loopback;
28082808

2809-
-- Will cache loopback connection with user mapping for multi_conn_user1
2810-
SET ROLE multi_conn_user1;
2809+
-- Will cache loopback connection with user mapping for regress_multi_conn_user1
2810+
SET ROLE regress_multi_conn_user1;
28112811
SELECT 1 FROM ft1 LIMIT 1;
28122812
RESET ROLE;
28132813

2814-
-- Will cache loopback connection with user mapping for multi_conn_user2
2815-
SET ROLE multi_conn_user2;
2814+
-- Will cache loopback connection with user mapping for regress_multi_conn_user2
2815+
SET ROLE regress_multi_conn_user2;
28162816
SELECT 1 FROM ft1 LIMIT 1;
28172817
RESET ROLE;
28182818

@@ -2827,10 +2827,10 @@ SELECT postgres_fdw_disconnect('loopback');
28272827
SELECT * FROM postgres_fdw_get_connections() ORDER BY 1;
28282828

28292829
-- Clean up
2830-
DROP USER MAPPING FOR multi_conn_user1 SERVER loopback;
2831-
DROP USER MAPPING FOR multi_conn_user2 SERVER loopback;
2832-
DROP ROLE multi_conn_user1;
2833-
DROP ROLE multi_conn_user2;
2830+
DROP USER MAPPING FOR regress_multi_conn_user1 SERVER loopback;
2831+
DROP USER MAPPING FOR regress_multi_conn_user2 SERVER loopback;
2832+
DROP ROLE regress_multi_conn_user1;
2833+
DROP ROLE regress_multi_conn_user2;
28342834

28352835
-- ===================================================================
28362836
-- batch insert

0 commit comments

Comments
 (0)