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

git projects / postgresql.git / commitdiff

2021年6月24日 19:02:13 +0000 (15:02 -0400)

The queries involving ft1_nopw don't stably return the same row
anymore. I surmise that an autovacuum hitting "S 1"."T 1"
right after the updates introduced by f61db909d/5843659d0 freed
some space, changing where subsequent insertions get stored.
It's only by good luck that these results were stable before,
though, since a LIMIT without ORDER BY isn't well defined,
and it's not like we've ever treated that table as append-only
in this test script.

Since we only really care whether these commands succeed or not,
just replace "SELECT *" with "SELECT 1".

Report: https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=crake&dt=2021年06月23日%2019%3A52%3A08

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 cc1cca30067f1518008a4cdcad036264ee91b9c2..31b5de91addefeefa36a71d3f72d0ffc217f2991 100644 (file)

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

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

@@ -9225,7 +9225,7 @@ CREATE FOREIGN TABLE ft1_nopw (

c7 char(10) default 'ft1',

c8 user_enum

) SERVER loopback_nopw OPTIONS (schema_name 'public', table_name 'ft1');

-SELECT * FROM ft1_nopw LIMIT 1;

+SELECT 1 FROM ft1_nopw LIMIT 1;

ERROR: password is required

DETAIL: Non-superusers must provide a password in the user mapping.

-- If we add a password to the connstr it'll fail, because we don't allow passwords

@@ -9244,7 +9244,7 @@ PL/pgSQL function inline_code_block line 3 at EXECUTE

-- This won't work with installcheck, but neither will most of the FDW checks.

ALTER USER MAPPING FOR CURRENT_USER SERVER loopback_nopw OPTIONS (ADD password 'dummypw');

-SELECT * FROM ft1_nopw LIMIT 1;

+SELECT 1 FROM ft1_nopw LIMIT 1;

ERROR: password is required

DETAIL: Non-superuser cannot connect if the server does not request a password.

HINT: Target server's authentication method must be changed or password_required=false set in the user mapping attributes.

@@ -9252,7 +9252,7 @@ HINT: Target server's authentication method must be changed or password_require

ALTER USER MAPPING FOR CURRENT_USER SERVER loopback_nopw OPTIONS (ADD password_required 'false');

ERROR: password_required=false is superuser-only

HINT: User mappings with the password_required option set to false may only be created or modified by the superuser

-SELECT * FROM ft1_nopw LIMIT 1;

+SELECT 1 FROM ft1_nopw LIMIT 1;

ERROR: password is required

DETAIL: Non-superuser cannot connect if the server does not request a password.

HINT: Target server's authentication method must be changed or password_required=false set in the user mapping attributes.

@@ -9261,10 +9261,10 @@ RESET ROLE;

ALTER USER MAPPING FOR regress_nosuper SERVER loopback_nopw OPTIONS (ADD password_required 'false');

SET ROLE regress_nosuper;

-- Should finally work now

-SELECT * FROM ft1_nopw LIMIT 1;

- c1 | c2 | c3 | c4 | c5 | c6 | c7 | c8

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

- 1111 | 2 | | | | | ft1 |

+SELECT 1 FROM ft1_nopw LIMIT 1;

+ ?column?

+----------

+ 1

(1 row)

-- unpriv user also cannot set sslcert / sslkey on the user mapping

@@ -9281,16 +9281,16 @@ HINT: User mappings with the sslcert or sslkey options set may only be created

DROP USER MAPPING FOR CURRENT_USER SERVER loopback_nopw;

-- This will fail again as it'll resolve the user mapping for public, which

-- lacks password_required=false

-SELECT * FROM ft1_nopw LIMIT 1;

+SELECT 1 FROM ft1_nopw LIMIT 1;

ERROR: password is required

DETAIL: Non-superusers must provide a password in the user mapping.

RESET ROLE;

-- The user mapping for public is passwordless and lacks the password_required=false

-- mapping option, but will work because the current user is a superuser.

-SELECT * FROM ft1_nopw LIMIT 1;

- c1 | c2 | c3 | c4 | c5 | c6 | c7 | c8

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

- 1111 | 2 | | | | | ft1 |

+SELECT 1 FROM ft1_nopw LIMIT 1;

+ ?column?

+----------

+ 1

(1 row)

-- cleanup

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

index 8983209c74bac8b673aa5c7006e17b78b8b7081f..286dd99573eb01645a1f33739ab1e5f14e6ea04e 100644 (file)

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

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

@@ -2746,7 +2746,7 @@ CREATE FOREIGN TABLE ft1_nopw (

c8 user_enum

) SERVER loopback_nopw OPTIONS (schema_name 'public', table_name 'ft1');

-SELECT * FROM ft1_nopw LIMIT 1;

+SELECT 1 FROM ft1_nopw LIMIT 1;

-- If we add a password to the connstr it'll fail, because we don't allow passwords

-- in connstrs only in user mappings.

@@ -2764,13 +2764,13 @@ $d$;

ALTER USER MAPPING FOR CURRENT_USER SERVER loopback_nopw OPTIONS (ADD password 'dummypw');

-SELECT * FROM ft1_nopw LIMIT 1;

+SELECT 1 FROM ft1_nopw LIMIT 1;

-- Unpriv user cannot make the mapping passwordless

ALTER USER MAPPING FOR CURRENT_USER SERVER loopback_nopw OPTIONS (ADD password_required 'false');

-SELECT * FROM ft1_nopw LIMIT 1;

+SELECT 1 FROM ft1_nopw LIMIT 1;

RESET ROLE;

@@ -2780,7 +2780,7 @@ ALTER USER MAPPING FOR regress_nosuper SERVER loopback_nopw OPTIONS (ADD passwor

SET ROLE regress_nosuper;

-- Should finally work now

-SELECT * FROM ft1_nopw LIMIT 1;

+SELECT 1 FROM ft1_nopw LIMIT 1;

-- unpriv user also cannot set sslcert / sslkey on the user mapping

-- first set password_required so we see the right error messages

@@ -2794,13 +2794,13 @@ DROP USER MAPPING FOR CURRENT_USER SERVER loopback_nopw;

-- This will fail again as it'll resolve the user mapping for public, which

-- lacks password_required=false

-SELECT * FROM ft1_nopw LIMIT 1;

+SELECT 1 FROM ft1_nopw LIMIT 1;

RESET ROLE;

-- The user mapping for public is passwordless and lacks the password_required=false

-- mapping option, but will work because the current user is a superuser.

-SELECT * FROM ft1_nopw LIMIT 1;

+SELECT 1 FROM ft1_nopw LIMIT 1;

-- cleanup

DROP USER MAPPING FOR public SERVER loopback_nopw;

This is the main PostgreSQL git repository.

RSS Atom