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

git projects / postgresql.git / commitdiff

Further stabilize output from rolenames regression test.

2020年9月26日 21:42:20 +0000 (17:42 -0400)

Commit e5209bf37 didn't quite get the job done, as I failed to
notice that chksetconfig() also needed to have its ORDER BY
extended. Per buildfarm member dory.

Report: https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=dory&dt=2020年09月26日%2020%3A10%3A13

src/test/modules/unsafe_tests/expected/rolenames.out patch | blob | blame | history

src/test/modules/unsafe_tests/sql/rolenames.sql patch | blob | blame | history

diff --git a/src/test/modules/unsafe_tests/expected/rolenames.out b/src/test/modules/unsafe_tests/expected/rolenames.out

index 6ddb1a83f67b67dfc462d0a67486eefdcc6eae26..eb608fdc2eaf77610bbd90878a3c502769390789 100644 (file)

--- a/src/test/modules/unsafe_tests/expected/rolenames.out

+++ b/src/test/modules/unsafe_tests/expected/rolenames.out

@@ -29,7 +29,7 @@ SELECT COALESCE(d.datname, 'ALL'), COALESCE(r.rolname, 'ALL'),

AS v(uname, keyword)

ON (r.rolname = v.uname)

WHERE (r.rolname) IN ('Public', 'current_user', 'regress_testrol1', 'regress_testrol2')

-ORDER BY 1, 2;

+ORDER BY 1, 2, 3;

$$ LANGUAGE SQL;

CREATE FUNCTION chkumapping()

RETURNS TABLE (umname name, umserver name, umoptions text[])

@@ -437,8 +437,8 @@ SELECT * FROM chksetconfig();

ALL | Public | - | {application_name=BARBAR}

ALL | current_user | - | {application_name=FOOFOO}

ALL | regress_testrol1 | session_user | {application_name=BAR}

- ALL | regress_testrol2 | current_user | {application_name=FOO}

ALL | regress_testrol2 | current_role | {application_name=FOO}

+ ALL | regress_testrol2 | current_user | {application_name=FOO}

(5 rows)

ALTER ROLE regress_testrol1 SET application_name to 'SLAM';

@@ -448,8 +448,8 @@ SELECT * FROM chksetconfig();

ALL | Public | - | {application_name=BARBAR}

ALL | current_user | - | {application_name=FOOFOO}

ALL | regress_testrol1 | session_user | {application_name=SLAM}

- ALL | regress_testrol2 | current_user | {application_name=FOO}

ALL | regress_testrol2 | current_role | {application_name=FOO}

+ ALL | regress_testrol2 | current_user | {application_name=FOO}

(5 rows)

ALTER ROLE CURRENT_ROLE RESET application_name;

@@ -489,8 +489,8 @@ SELECT * FROM chksetconfig();

ALL | Public | - | {application_name=BARBAR}

ALL | current_user | - | {application_name=FOOFOO}

ALL | regress_testrol1 | session_user | {application_name=BAR}

- ALL | regress_testrol2 | current_user | {application_name=FOO}

ALL | regress_testrol2 | current_role | {application_name=FOO}

+ ALL | regress_testrol2 | current_user | {application_name=FOO}

(5 rows)

ALTER USER regress_testrol1 SET application_name to 'SLAM';

@@ -500,8 +500,8 @@ SELECT * FROM chksetconfig();

ALL | Public | - | {application_name=BARBAR}

ALL | current_user | - | {application_name=FOOFOO}

ALL | regress_testrol1 | session_user | {application_name=SLAM}

- ALL | regress_testrol2 | current_user | {application_name=FOO}

ALL | regress_testrol2 | current_role | {application_name=FOO}

+ ALL | regress_testrol2 | current_user | {application_name=FOO}

(5 rows)

ALTER USER CURRENT_ROLE RESET application_name;

diff --git a/src/test/modules/unsafe_tests/sql/rolenames.sql b/src/test/modules/unsafe_tests/sql/rolenames.sql

index 40dc86fdb9b3a63a80012f0b03922cf48752bd25..adac36536db4db137bd84f0f470db2c12ccdf182 100644 (file)

--- a/src/test/modules/unsafe_tests/sql/rolenames.sql

+++ b/src/test/modules/unsafe_tests/sql/rolenames.sql

@@ -30,7 +30,7 @@ SELECT COALESCE(d.datname, 'ALL'), COALESCE(r.rolname, 'ALL'),

AS v(uname, keyword)

ON (r.rolname = v.uname)

WHERE (r.rolname) IN ('Public', 'current_user', 'regress_testrol1', 'regress_testrol2')

-ORDER BY 1, 2;

+ORDER BY 1, 2, 3;

$$ LANGUAGE SQL;

CREATE FUNCTION chkumapping()

This is the main PostgreSQL git repository.

RSS Atom