Skip to content

Commit 4b05ebf

Browse files
committed
Change role names used in trigger test.
The choices made in commit 01463e1 might pose copyright hazards, and are more cutesy than informative anyway. Reported-by: Noah Misch <noah@leadboat.com> Author: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/20250415155850.9b.nmisch@google.com
1 parent 112e40b commit 4b05ebf

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

src/test/regress/expected/triggers.out

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3535,16 +3535,16 @@ drop table parent, child;
35353535
drop function f();
35363536
-- Test who runs deferred trigger functions
35373537
-- setup
3538-
create role regress_groot;
3539-
create role regress_outis;
3538+
create role regress_caller;
3539+
create role regress_fn_owner;
35403540
create function whoami() returns trigger language plpgsql
35413541
as $$
35423542
begin
35433543
raise notice 'I am %', current_user;
35443544
return null;
35453545
end;
35463546
$$;
3547-
alter function whoami() owner to regress_outis;
3547+
alter function whoami() owner to regress_fn_owner;
35483548
create table defer_trig (id integer);
35493549
grant insert on defer_trig to public;
35503550
create constraint trigger whoami after insert on defer_trig
@@ -3553,23 +3553,23 @@ create constraint trigger whoami after insert on defer_trig
35533553
execute function whoami();
35543554
-- deferred triggers must run as the user that queued the trigger
35553555
begin;
3556-
set role regress_groot;
3556+
set role regress_caller;
35573557
insert into defer_trig values (1);
35583558
reset role;
3559-
set role regress_outis;
3559+
set role regress_fn_owner;
35603560
insert into defer_trig values (2);
35613561
reset role;
35623562
commit;
3563-
NOTICE: I am regress_groot
3564-
NOTICE: I am regress_outis
3563+
NOTICE: I am regress_caller
3564+
NOTICE: I am regress_fn_owner
35653565
-- security definer functions override the user who queued the trigger
35663566
alter function whoami() security definer;
35673567
begin;
3568-
set role regress_groot;
3568+
set role regress_caller;
35693569
insert into defer_trig values (3);
35703570
reset role;
35713571
commit;
3572-
NOTICE: I am regress_outis
3572+
NOTICE: I am regress_fn_owner
35733573
alter function whoami() security invoker;
35743574
-- make sure the current user is restored after error
35753575
create or replace function whoami() returns trigger language plpgsql
@@ -3581,11 +3581,11 @@ begin
35813581
end;
35823582
$$;
35833583
begin;
3584-
set role regress_groot;
3584+
set role regress_caller;
35853585
insert into defer_trig values (4);
35863586
reset role;
35873587
commit; -- error expected
3588-
NOTICE: I am regress_groot
3588+
NOTICE: I am regress_caller
35893589
ERROR: division by zero
35903590
CONTEXT: SQL statement "SELECT 1 / 0"
35913591
PL/pgSQL function whoami() line 4 at PERFORM
@@ -3598,5 +3598,5 @@ select current_user = session_user;
35983598
-- clean up
35993599
drop table defer_trig;
36003600
drop function whoami();
3601-
drop role regress_outis;
3602-
drop role regress_groot;
3601+
drop role regress_fn_owner;
3602+
drop role regress_caller;

src/test/regress/sql/triggers.sql

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,16 +2701,16 @@ drop function f();
27012701
-- Test who runs deferred trigger functions
27022702

27032703
-- setup
2704-
create role regress_groot;
2705-
create role regress_outis;
2704+
create role regress_caller;
2705+
create role regress_fn_owner;
27062706
create function whoami() returns trigger language plpgsql
27072707
as $$
27082708
begin
27092709
raise notice 'I am %', current_user;
27102710
return null;
27112711
end;
27122712
$$;
2713-
alter function whoami() owner to regress_outis;
2713+
alter function whoami() owner to regress_fn_owner;
27142714

27152715
create table defer_trig (id integer);
27162716
grant insert on defer_trig to public;
@@ -2721,18 +2721,18 @@ create constraint trigger whoami after insert on defer_trig
27212721

27222722
-- deferred triggers must run as the user that queued the trigger
27232723
begin;
2724-
set role regress_groot;
2724+
set role regress_caller;
27252725
insert into defer_trig values (1);
27262726
reset role;
2727-
set role regress_outis;
2727+
set role regress_fn_owner;
27282728
insert into defer_trig values (2);
27292729
reset role;
27302730
commit;
27312731

27322732
-- security definer functions override the user who queued the trigger
27332733
alter function whoami() security definer;
27342734
begin;
2735-
set role regress_groot;
2735+
set role regress_caller;
27362736
insert into defer_trig values (3);
27372737
reset role;
27382738
commit;
@@ -2749,7 +2749,7 @@ end;
27492749
$$;
27502750

27512751
begin;
2752-
set role regress_groot;
2752+
set role regress_caller;
27532753
insert into defer_trig values (4);
27542754
reset role;
27552755
commit; -- error expected
@@ -2758,5 +2758,5 @@ select current_user = session_user;
27582758
-- clean up
27592759
drop table defer_trig;
27602760
drop function whoami();
2761-
drop role regress_outis;
2762-
drop role regress_groot;
2761+
drop role regress_fn_owner;
2762+
drop role regress_caller;

0 commit comments

Comments
 (0)