summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2020-09-26 21:42:20 +0000
committerTom Lane2020-09-26 21:42:20 +0000
commit3c8819955023694feeaa456ee60853d0d6d0e60a (patch)
treeff14033797239dc126c0637cc1c9c97d7e3fc35d
parente55f718fc429fb7971eb7351debfa5931f9811bf (diff)
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
-rw-r--r--src/test/modules/unsafe_tests/expected/rolenames.out10
-rw-r--r--src/test/modules/unsafe_tests/sql/rolenames.sql2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/test/modules/unsafe_tests/expected/rolenames.out b/src/test/modules/unsafe_tests/expected/rolenames.out
index 6ddb1a83f6..eb608fdc2e 100644
--- 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 40dc86fdb9..adac36536d 100644
--- 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()