Browse Source

Further stabilize output from rolenames regression test.

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
master
Tom Lane 1 month ago
parent
commit
3c88199550
2 changed files with 6 additions and 6 deletions
  1. +5
    -5
      src/test/modules/unsafe_tests/expected/rolenames.out
  2. +1
    -1
      src/test/modules/unsafe_tests/sql/rolenames.sql

+ 5
- 5
src/test/modules/unsafe_tests/expected/rolenames.out View File

@ -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;

+ 1
- 1
src/test/modules/unsafe_tests/sql/rolenames.sql View File

@ -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()

Loading…
Cancel
Save