Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c484134

Browse files
committed
Clean up duplicate role and schema names in regression tests.
Since these names are global, using the same ones in different regression tests creates a hazard of test failures if any two such scripts run concurrently. Let's establish a policy of not doing that. In the cases where a conflict existed, I chose to rename both sides: in principle one script 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 seem unduly 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-patch that change to v10 where the usage appeared. The rest of this is just future-proofing, as no two of these scripts are actually run concurrently in the existing parallel_schedule. Conflicts of schema-qualified names also exist, but will be dealt with separately. Discussion: https://postgr.es/m/4627.1521070268@sss.pgh.pa.us
1 parent a2102e1 commit c484134

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

src/test/regress/expected/insert.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -429,16 +429,16 @@ drop table mlparted5;
429429
-- appropriate key description (or none) in various situations
430430
create table key_desc (a int, b int) partition by list ((a+0));
431431
create table key_desc_1 partition of key_desc for values in (1) partition by range (b);
432-
create user someone_else;
433-
grant select (a) on key_desc_1 to someone_else;
434-
grant insert on key_desc to someone_else;
435-
set role someone_else;
432+
create user regress_insert_other_user;
433+
grant select (a) on key_desc_1 to regress_insert_other_user;
434+
grant insert on key_desc to regress_insert_other_user;
435+
set role regress_insert_other_user;
436436
-- no key description is shown
437437
insert into key_desc values (1, 1);
438438
ERROR: no partition of relation "key_desc_1" found for row
439439
reset role;
440-
grant select (b) on key_desc_1 to someone_else;
441-
set role someone_else;
440+
grant select (b) on key_desc_1 to regress_insert_other_user;
441+
set role regress_insert_other_user;
442442
-- key description (b)=(1) is now shown
443443
insert into key_desc values (1, 1);
444444
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).
447447
insert into key_desc values (2, 1);
448448
ERROR: no partition of relation "key_desc" found for row
449449
reset role;
450-
revoke all on key_desc from someone_else;
451-
revoke all on key_desc_1 from someone_else;
452-
drop role someone_else;
450+
revoke all on key_desc from regress_insert_other_user;
451+
revoke all on key_desc_1 from regress_insert_other_user;
452+
drop role regress_insert_other_user;
453453
drop table key_desc, key_desc_1;
454454
-- test minvalue/maxvalue restrictions
455455
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 numberDiff line numberDiff line change
@@ -280,26 +280,26 @@ drop table mlparted5;
280280
create table key_desc (a int, b int) partition by list ((a+0));
281281
create table key_desc_1 partition of key_desc for values in (1) partition by range (b);
282282

283-
create user someone_else;
284-
grant select (a) on key_desc_1 to someone_else;
285-
grant insert on key_desc to someone_else;
283+
create user regress_insert_other_user;
284+
grant select (a) on key_desc_1 to regress_insert_other_user;
285+
grant insert on key_desc to regress_insert_other_user;
286286

287-
set role someone_else;
287+
set role regress_insert_other_user;
288288
-- no key description is shown
289289
insert into key_desc values (1, 1);
290290

291291
reset role;
292-
grant select (b) on key_desc_1 to someone_else;
293-
set role someone_else;
292+
grant select (b) on key_desc_1 to regress_insert_other_user;
293+
set role regress_insert_other_user;
294294
-- key description (b)=(1) is now shown
295295
insert into key_desc values (1, 1);
296296

297297
-- key description is not shown if key contains expression
298298
insert into key_desc values (2, 1);
299299
reset role;
300-
revoke all on key_desc from someone_else;
301-
revoke all on key_desc_1 from someone_else;
302-
drop role someone_else;
300+
revoke all on key_desc from regress_insert_other_user;
301+
revoke all on key_desc_1 from regress_insert_other_user;
302+
drop role regress_insert_other_user;
303303
drop table key_desc, key_desc_1;
304304

305305
-- test minvalue/maxvalue restrictions

0 commit comments

Comments
 (0)