NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8021770

committed

Further stabilize postgres_fdw test.

The queries involving ft1_nopw don't stably return the same rowanymore. I surmise that an autovacuum hitting "S 1"."T 1"right after the updates introduced byf61db90/5843659d0 freedsome 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-onlyin 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

1 parent9b8ed0f commit8021770Copy full SHA for 8021770

File tree

2 files changed

+18

-18

lines changed

contrib/postgres_fdw
- expected
  - postgres_fdw.out
- sql
  - postgres_fdw.sql

2 files changed

+18

-18

lines changed

`‎contrib/postgres_fdw/expected/postgres_fdw.out`

Lines changed: 12 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -9225,7 +9225,7 @@ CREATE FOREIGN TABLE ft1_nopw (`
`9225`	`9225`	`c7 char(10) default 'ft1',`
`9226`	`9226`	`c8 user_enum`
`9227`	`9227`	`) SERVER loopback_nopw OPTIONS (schema_name 'public', table_name 'ft1');`
`9228`		`-SELECT* FROM ft1_nopw LIMIT 1;`
	`9228`	`+SELECT1 FROM ft1_nopw LIMIT 1;`
`9229`	`9229`	`ERROR: password is required`
`9230`	`9230`	`DETAIL: Non-superusers must provide a password in the user mapping.`
`9231`	`9231`	`-- If we add a password to the connstr it'll fail, because we don't allow passwords`
`@@ -9244,15 +9244,15 @@ PL/pgSQL function inline_code_block line 3 at EXECUTE`
`9244`	`9244`	`--`
`9245`	`9245`	`-- This won't work with installcheck, but neither will most of the FDW checks.`
`9246`	`9246`	`ALTER USER MAPPING FOR CURRENT_USER SERVER loopback_nopw OPTIONS (ADD password 'dummypw');`
`9247`		`-SELECT* FROM ft1_nopw LIMIT 1;`
	`9247`	`+SELECT1 FROM ft1_nopw LIMIT 1;`
`9248`	`9248`	`ERROR: password is required`
`9249`	`9249`	`DETAIL: Non-superuser cannot connect if the server does not request a password.`
`9250`	`9250`	`HINT: Target server's authentication method must be changed or password_required=false set in the user mapping attributes.`
`9251`	`9251`	`-- Unpriv user cannot make the mapping passwordless`
`9252`	`9252`	`ALTER USER MAPPING FOR CURRENT_USER SERVER loopback_nopw OPTIONS (ADD password_required 'false');`
`9253`	`9253`	`ERROR: password_required=false is superuser-only`
`9254`	`9254`	`HINT: User mappings with the password_required option set to false may only be created or modified by the superuser`
`9255`		`-SELECT* FROM ft1_nopw LIMIT 1;`
	`9255`	`+SELECT1 FROM ft1_nopw LIMIT 1;`
`9256`	`9256`	`ERROR: password is required`
`9257`	`9257`	`DETAIL: Non-superuser cannot connect if the server does not request a password.`
`9258`	`9258`	`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;`
`9261`	`9261`	`ALTER USER MAPPING FOR regress_nosuper SERVER loopback_nopw OPTIONS (ADD password_required 'false');`
`9262`	`9262`	`SET ROLE regress_nosuper;`
`9263`	`9263`	`-- Should finally work now`
`9264`		`-SELECT* FROM ft1_nopw LIMIT 1;`
`9265`		`- c1 \| c2 \| c3 \| c4 \| c5 \| c6 \| c7 \| c8`
`9266`		`-------+----+----+----+----+----+------------+----`
`9267`		`-1111 \| 2 \| \| \| \| \| ft1 \|`
	`9264`	`+SELECT1 FROM ft1_nopw LIMIT 1;`
	`9265`	`+?column?`
	`9266`	`+----------`
	`9267`	`+1`
`9268`	`9268`	`(1 row)`
`9269`	`9269`
`9270`	`9270`	`-- 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`
`9281`	`9281`	`DROP USER MAPPING FOR CURRENT_USER SERVER loopback_nopw;`
`9282`	`9282`	`-- This will fail again as it'll resolve the user mapping for public, which`
`9283`	`9283`	`-- lacks password_required=false`
`9284`		`-SELECT* FROM ft1_nopw LIMIT 1;`
	`9284`	`+SELECT1 FROM ft1_nopw LIMIT 1;`
`9285`	`9285`	`ERROR: password is required`
`9286`	`9286`	`DETAIL: Non-superusers must provide a password in the user mapping.`
`9287`	`9287`	`RESET ROLE;`
`9288`	`9288`	`-- The user mapping for public is passwordless and lacks the password_required=false`
`9289`	`9289`	`-- mapping option, but will work because the current user is a superuser.`
`9290`		`-SELECT* FROM ft1_nopw LIMIT 1;`
`9291`		`- c1 \| c2 \| c3 \| c4 \| c5 \| c6 \| c7 \| c8`
`9292`		`-------+----+----+----+----+----+------------+----`
`9293`		`-1111 \| 2 \| \| \| \| \| ft1 \|`
	`9290`	`+SELECT1 FROM ft1_nopw LIMIT 1;`
	`9291`	`+?column?`
	`9292`	`+----------`
	`9293`	`+1`
`9294`	`9294`	`(1 row)`
`9295`	`9295`
`9296`	`9296`	`-- cleanup`

`‎contrib/postgres_fdw/sql/postgres_fdw.sql`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2746,7 +2746,7 @@ CREATE FOREIGN TABLE ft1_nopw (`
`2746`	`2746`	`c8 user_enum`
`2747`	`2747`	`) SERVER loopback_nopw OPTIONS (schema_name'public', table_name'ft1');`
`2748`	`2748`
`2749`		`-SELECT*FROM ft1_nopwLIMIT1;`
	`2749`	`+SELECT1FROM ft1_nopwLIMIT1;`
`2750`	`2750`
`2751`	`2751`	`-- If we add a password to the connstr it'll fail, because we don't allow passwords`
`2752`	`2752`	`-- in connstrs only in user mappings.`
`@@ -2764,13 +2764,13 @@ $d$;`
`2764`	`2764`
`2765`	`2765`	`ALTERUSER MAPPING FORCURRENT_USER SERVER loopback_nopw OPTIONS (ADD password'dummypw');`
`2766`	`2766`
`2767`		`-SELECT*FROM ft1_nopwLIMIT1;`
	`2767`	`+SELECT1FROM ft1_nopwLIMIT1;`
`2768`	`2768`
`2769`	`2769`	`-- Unpriv user cannot make the mapping passwordless`
`2770`	`2770`	`ALTERUSER MAPPING FORCURRENT_USER SERVER loopback_nopw OPTIONS (ADD password_required'false');`
`2771`	`2771`
`2772`	`2772`
`2773`		`-SELECT*FROM ft1_nopwLIMIT1;`
	`2773`	`+SELECT1FROM ft1_nopwLIMIT1;`
`2774`	`2774`
`2775`	`2775`	`RESET ROLE;`
`2776`	`2776`
`@@ -2780,7 +2780,7 @@ ALTER USER MAPPING FOR regress_nosuper SERVER loopback_nopw OPTIONS (ADD passwor`
`2780`	`2780`	`SET ROLE regress_nosuper;`
`2781`	`2781`
`2782`	`2782`	`-- Should finally work now`
`2783`		`-SELECT*FROM ft1_nopwLIMIT1;`
	`2783`	`+SELECT1FROM ft1_nopwLIMIT1;`
`2784`	`2784`
`2785`	`2785`	`-- unpriv user also cannot set sslcert / sslkey on the user mapping`
`2786`	`2786`	`-- first set password_required so we see the right error messages`
`@@ -2794,13 +2794,13 @@ DROP USER MAPPING FOR CURRENT_USER SERVER loopback_nopw;`
`2794`	`2794`
`2795`	`2795`	`-- This will fail again as it'll resolve the user mapping for public, which`
`2796`	`2796`	`-- lacks password_required=false`
`2797`		`-SELECT*FROM ft1_nopwLIMIT1;`
	`2797`	`+SELECT1FROM ft1_nopwLIMIT1;`
`2798`	`2798`
`2799`	`2799`	`RESET ROLE;`
`2800`	`2800`
`2801`	`2801`	`-- The user mapping for public is passwordless and lacks the password_required=false`
`2802`	`2802`	`-- mapping option, but will work because the current user is a superuser.`
`2803`		`-SELECT*FROM ft1_nopwLIMIT1;`
	`2803`	`+SELECT1FROM ft1_nopwLIMIT1;`
`2804`	`2804`
`2805`	`2805`	`-- cleanup`
`2806`	`2806`	`DROPUSER MAPPING FOR public SERVER loopback_nopw;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8021770

File tree

2 files changed

2 files changed

`‎contrib/postgres_fdw/expected/postgres_fdw.out`

`‎contrib/postgres_fdw/sql/postgres_fdw.sql`

0 commit comments