NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc484134

committed

Clean up duplicate role and schema names in regression tests.

Since these names are global, using the same ones in different regressiontests creates a hazard of test failures if any two such scripts runconcurrently. Let's establish a policy of not doing that. In the caseswhere a conflict existed, I chose to rename both sides: in principle onescript or the other could've been left in possession of the common name,but that seems to just invite more trouble of the same sort.There are a number of places where scripts are using names that seemunduly generic, but in the absence of actual conflicts I left them alone.In addition, fix insert.sql's use of "someone_else" as a role name.That's a flat out violation of longstanding project policy, so back-patchthat change to v10 where the usage appeared. The rest of this is justfuture-proofing, as no two of these scripts are actually run concurrentlyin the existing parallel_schedule.Conflicts of schema-qualified names also exist, but will be dealt withseparately.Discussion:https://postgr.es/m/4627.1521070268@sss.pgh.pa.us

1 parenta2102e1 commitc484134Copy full SHA for c484134

File tree

2 files changed

+18

-18

lines changed

src/test/regress
- expected
  - insert.out
- sql
  - insert.sql

2 files changed

+18

-18

lines changed

`‎src/test/regress/expected/insert.out`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -429,16 +429,16 @@ drop table mlparted5;`
`429`	`429`	`-- appropriate key description (or none) in various situations`
`430`	`430`	`create table key_desc (a int, b int) partition by list ((a+0));`
`431`	`431`	`create table key_desc_1 partition of key_desc for values in (1) partition by range (b);`
`432`		`-create usersomeone_else;`
`433`		`-grant select (a) on key_desc_1 tosomeone_else;`
`434`		`-grant insert on key_desc tosomeone_else;`
`435`		`-set rolesomeone_else;`
	`432`	`+create userregress_insert_other_user;`
	`433`	`+grant select (a) on key_desc_1 toregress_insert_other_user;`
	`434`	`+grant insert on key_desc toregress_insert_other_user;`
	`435`	`+set roleregress_insert_other_user;`
`436`	`436`	`-- no key description is shown`
`437`	`437`	`insert into key_desc values (1, 1);`
`438`	`438`	`ERROR: no partition of relation "key_desc_1" found for row`
`439`	`439`	`reset role;`
`440`		`-grant select (b) on key_desc_1 tosomeone_else;`
`441`		`-set rolesomeone_else;`
	`440`	`+grant select (b) on key_desc_1 toregress_insert_other_user;`
	`441`	`+set roleregress_insert_other_user;`
`442`	`442`	`-- key description (b)=(1) is now shown`
`443`	`443`	`insert into key_desc values (1, 1);`
`444`	`444`	`ERROR: no partition of relation "key_desc_1" found for row`
`@@ -447,9 +447,9 @@ DETAIL: Partition key of the failing row contains (b) = (1).`
`447`	`447`	`insert into key_desc values (2, 1);`
`448`	`448`	`ERROR: no partition of relation "key_desc" found for row`
`449`	`449`	`reset role;`
`450`		`-revoke all on key_desc fromsomeone_else;`
`451`		`-revoke all on key_desc_1 fromsomeone_else;`
`452`		`-drop rolesomeone_else;`
	`450`	`+revoke all on key_desc fromregress_insert_other_user;`
	`451`	`+revoke all on key_desc_1 fromregress_insert_other_user;`
	`452`	`+drop roleregress_insert_other_user;`
`453`	`453`	`drop table key_desc, key_desc_1;`
`454`	`454`	`-- test minvalue/maxvalue restrictions`
`455`	`455`	`create table mcrparted (a int, b int, c int) partition by range (a, abs(b), c);`

`‎src/test/regress/sql/insert.sql`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -280,26 +280,26 @@ drop table mlparted5;`
`280`	`280`	`createtablekey_desc (aint, bint) partition by list ((a+0));`
`281`	`281`	`createtablekey_desc_1 partition of key_desc forvaluesin (1) partition by range (b);`
`282`	`282`
`283`		`-createusersomeone_else;`
`284`		`-grantselect (a)on key_desc_1 tosomeone_else;`
`285`		`-grant inserton key_desc tosomeone_else;`
	`283`	`+createuserregress_insert_other_user;`
	`284`	`+grantselect (a)on key_desc_1 toregress_insert_other_user;`
	`285`	`+grant inserton key_desc toregress_insert_other_user;`
`286`	`286`
`287`		`-set rolesomeone_else;`
	`287`	`+set roleregress_insert_other_user;`
`288`	`288`	`-- no key description is shown`
`289`	`289`	`insert into key_descvalues (1,1);`
`290`	`290`
`291`	`291`	`reset role;`
`292`		`-grantselect (b)on key_desc_1 tosomeone_else;`
`293`		`-set rolesomeone_else;`
	`292`	`+grantselect (b)on key_desc_1 toregress_insert_other_user;`
	`293`	`+set roleregress_insert_other_user;`
`294`	`294`	`-- key description (b)=(1) is now shown`
`295`	`295`	`insert into key_descvalues (1,1);`
`296`	`296`
`297`	`297`	`-- key description is not shown if key contains expression`
`298`	`298`	`insert into key_descvalues (2,1);`
`299`	`299`	`reset role;`
`300`		`-revoke allon key_descfromsomeone_else;`
`301`		`-revoke allon key_desc_1fromsomeone_else;`
`302`		`-drop rolesomeone_else;`
	`300`	`+revoke allon key_descfromregress_insert_other_user;`
	`301`	`+revoke allon key_desc_1fromregress_insert_other_user;`
	`302`	`+drop roleregress_insert_other_user;`
`303`	`303`	`droptable key_desc, key_desc_1;`
`304`	`304`
`305`	`305`	`-- test minvalue/maxvalue restrictions`

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!

Commitc484134

File tree

2 files changed

2 files changed

`‎src/test/regress/expected/insert.out`

`‎src/test/regress/sql/insert.sql`

0 commit comments