git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 063ff92)

Stabilize postgres_fdw regression tests.

author Tom Lane <tgl@sss.pgh.pa.us>

2017年7月21日 18:20:43 +0000 (14:20 -0400)

committer Tom Lane <tgl@sss.pgh.pa.us>

2017年7月21日 18:20:43 +0000 (14:20 -0400)

The new test cases added in commit 8bf58c0d9 turn out to have output
that can vary depending on the lc_messages setting prevailing on the
test server. Hide the remote end's error messages to ensure stable
output. This isn't a terribly desirable solution; we'd rather know
that the connection failed for the expected reason and not some other
one. But there seems little choice for the moment.

Per buildfarm.

Discussion: https://postgr.es/m/18419.1500658570@sss.pgh.pa.us

contrib/postgres_fdw/expected/postgres_fdw.out patch | blob | blame | history

contrib/postgres_fdw/sql/postgres_fdw.sql patch | blob | blame | history

diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out

index ee75c4b1f37032450b8f530a678b3abc19aa35b3..5bb3d97401e978911a66f32341bdce458615c773 100644 (file)

--- a/contrib/postgres_fdw/expected/postgres_fdw.out

+++ b/contrib/postgres_fdw/expected/postgres_fdw.out

@@ -192,6 +192,8 @@ ALTER FOREIGN TABLE ft2 ALTER COLUMN c1 OPTIONS (column_name 'C 1');

(6 rows)

-- Test that alteration of server options causes reconnection

+-- Remote's errors might be non-English, so hide them to ensure stable results

+\set VERBOSITY terse

SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work

c3 | c4

-------+------------------------------

@@ -201,7 +203,6 @@ SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work

ALTER SERVER loopback OPTIONS (SET dbname 'no such database');

SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail

ERROR: could not connect to server "loopback"

-DETAIL: FATAL: database "no such database" does not exist

DO $d$

BEGIN

EXECUTE $$ALTER SERVER loopback

@@ -219,7 +220,6 @@ ALTER USER MAPPING FOR CURRENT_USER SERVER loopback

OPTIONS (ADD user 'no such user');

SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail

ERROR: could not connect to server "loopback"

-DETAIL: FATAL: role "no such user" does not exist

ALTER USER MAPPING FOR CURRENT_USER SERVER loopback

OPTIONS (DROP user);

SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work again

@@ -228,6 +228,7 @@ SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work again

00001 | Fri Jan 02 00:00:00 1970 PST

(1 row)

+\set VERBOSITY default

-- Now we should be able to run ANALYZE.

-- To exercise multiple code paths, we use local stats on ft1

-- and remote-estimate mode on ft2.

diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql

index 2eca879da5ff4f738a4dce6c49a30cc32326eaca..bb92189b0e68065b496a35a87efba7f6a0d69ac8 100644 (file)

--- a/contrib/postgres_fdw/sql/postgres_fdw.sql

+++ b/contrib/postgres_fdw/sql/postgres_fdw.sql

@@ -196,6 +196,8 @@ ALTER FOREIGN TABLE ft2 ALTER COLUMN c1 OPTIONS (column_name 'C 1');

\det+

-- Test that alteration of server options causes reconnection

+-- Remote's errors might be non-English, so hide them to ensure stable results

+\set VERBOSITY terse

SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work

ALTER SERVER loopback OPTIONS (SET dbname 'no such database');

SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail

@@ -214,6 +216,7 @@ SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail

ALTER USER MAPPING FOR CURRENT_USER SERVER loopback

OPTIONS (DROP user);

SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work again

+\set VERBOSITY default

-- Now we should be able to run ANALYZE.

-- To exercise multiple code paths, we use local stats on ft1

This is the main PostgreSQL git repository.