NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit3c88199

committed

Further stabilize output from rolenames regression test.

Commite5209bf didn't quite get the job done, as I failed tonotice that chksetconfig() also needed to have its ORDER BYextended. Per buildfarm member dory.Report:https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=dory&dt=2020-09-26%2020%3A10%3A13

1 parente55f718 commit3c88199Copy full SHA for 3c88199

File tree

2 files changed

-6

lines changed

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

2 files changed

-6

lines changed

`‎src/test/modules/unsafe_tests/expected/rolenames.out`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ SELECT COALESCE(d.datname, 'ALL'), COALESCE(r.rolname, 'ALL'),`
`29`	`29`	`AS v(uname, keyword)`
`30`	`30`	`ON (r.rolname = v.uname)`
`31`	`31`	`WHERE (r.rolname) IN ('Public', 'current_user', 'regress_testrol1', 'regress_testrol2')`
`32`		`-ORDER BY 1, 2;`
	`32`	`+ORDER BY 1, 2, 3;`
`33`	`33`	`$$ LANGUAGE SQL;`
`34`	`34`	`CREATE FUNCTION chkumapping()`
`35`	`35`	`RETURNS TABLE (umname name, umserver name, umoptions text[])`
`@@ -437,8 +437,8 @@ SELECT * FROM chksetconfig();`
`437`	`437`	`ALL \| Public \| - \| {application_name=BARBAR}`
`438`	`438`	`ALL \| current_user \| - \| {application_name=FOOFOO}`
`439`	`439`	`ALL \| regress_testrol1 \| session_user \| {application_name=BAR}`
`440`		`- ALL \| regress_testrol2 \| current_user \| {application_name=FOO}`
`441`	`440`	`ALL \| regress_testrol2 \| current_role \| {application_name=FOO}`
	`441`	`+ ALL \| regress_testrol2 \| current_user \| {application_name=FOO}`
`442`	`442`	`(5 rows)`
`443`	`443`
`444`	`444`	`ALTER ROLE regress_testrol1 SET application_name to 'SLAM';`
`@@ -448,8 +448,8 @@ SELECT * FROM chksetconfig();`
`448`	`448`	`ALL \| Public \| - \| {application_name=BARBAR}`
`449`	`449`	`ALL \| current_user \| - \| {application_name=FOOFOO}`
`450`	`450`	`ALL \| regress_testrol1 \| session_user \| {application_name=SLAM}`
`451`		`- ALL \| regress_testrol2 \| current_user \| {application_name=FOO}`
`452`	`451`	`ALL \| regress_testrol2 \| current_role \| {application_name=FOO}`
	`452`	`+ ALL \| regress_testrol2 \| current_user \| {application_name=FOO}`
`453`	`453`	`(5 rows)`
`454`	`454`
`455`	`455`	`ALTER ROLE CURRENT_ROLE RESET application_name;`
`@@ -489,8 +489,8 @@ SELECT * FROM chksetconfig();`
`489`	`489`	`ALL \| Public \| - \| {application_name=BARBAR}`
`490`	`490`	`ALL \| current_user \| - \| {application_name=FOOFOO}`
`491`	`491`	`ALL \| regress_testrol1 \| session_user \| {application_name=BAR}`
`492`		`- ALL \| regress_testrol2 \| current_user \| {application_name=FOO}`
`493`	`492`	`ALL \| regress_testrol2 \| current_role \| {application_name=FOO}`
	`493`	`+ ALL \| regress_testrol2 \| current_user \| {application_name=FOO}`
`494`	`494`	`(5 rows)`
`495`	`495`
`496`	`496`	`ALTER USER regress_testrol1 SET application_name to 'SLAM';`
`@@ -500,8 +500,8 @@ SELECT * FROM chksetconfig();`
`500`	`500`	`ALL \| Public \| - \| {application_name=BARBAR}`
`501`	`501`	`ALL \| current_user \| - \| {application_name=FOOFOO}`
`502`	`502`	`ALL \| regress_testrol1 \| session_user \| {application_name=SLAM}`
`503`		`- ALL \| regress_testrol2 \| current_user \| {application_name=FOO}`
`504`	`503`	`ALL \| regress_testrol2 \| current_role \| {application_name=FOO}`
	`504`	`+ ALL \| regress_testrol2 \| current_user \| {application_name=FOO}`
`505`	`505`	`(5 rows)`
`506`	`506`
`507`	`507`	`ALTER USER CURRENT_ROLE RESET application_name;`

`‎src/test/modules/unsafe_tests/sql/rolenames.sql`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ SELECT COALESCE(d.datname, 'ALL'), COALESCE(r.rolname, 'ALL'),`
`30`	`30`	`AS v(uname, keyword)`
`31`	`31`	`ON (r.rolname=v.uname)`
`32`	`32`	`WHERE (r.rolname)IN ('Public','current_user','regress_testrol1','regress_testrol2')`
`33`		`-ORDER BY1,2;`
	`33`	`+ORDER BY1,2,3;`
`34`	`34`	`$$ LANGUAGE SQL;`
`35`	`35`
`36`	`36`	`CREATEFUNCTIONchkumapping()`

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!

Commit3c88199

File tree

2 files changed

2 files changed

`‎src/test/modules/unsafe_tests/expected/rolenames.out`

`‎src/test/modules/unsafe_tests/sql/rolenames.sql`

0 commit comments