Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitae0a294

Browse files
committed
Propagate trigger arguments to partitions
We were creating the cloned triggers with an empty list of arguments,losing the ones that had been specified by the user when creating thetrigger in the partitioned table. Repair.This was forgotten in commit86f5759.Author: Patrick McHardyReviewed-by: Tomas VondraDiscussion:https://postgr.es/m/20190709130027.amr2cavjvo7rdvac@access1.trash.netDiscussion:https://postgr.es/m/15752-123bc90287986de4@postgresql.org
1 parent48d6d5a commitae0a294

File tree

4 files changed

+69
-2
lines changed

4 files changed

+69
-2
lines changed

‎src/backend/commands/tablecmds.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15915,6 +15915,7 @@ CloneRowTriggersToPartition(Relation parent, Relation partition)
1591515915
Datumvalue;
1591615916
boolisnull;
1591715917
List *cols = NIL;
15918+
List *trigargs = NIL;
1591815919
MemoryContext oldcxt;
1591915920

1592015921
/*
@@ -15979,11 +15980,31 @@ CloneRowTriggersToPartition(Relation parent, Relation partition)
1597915980
}
1598015981
}
1598115982

15983+
/* Reconstruct trigger arguments list. */
15984+
if (trigForm->tgnargs > 0)
15985+
{
15986+
char *p;
15987+
15988+
value = heap_getattr(tuple, Anum_pg_trigger_tgargs,
15989+
RelationGetDescr(pg_trigger), &isnull);
15990+
if (isnull)
15991+
elog(ERROR, "tgargs is null for trigger \"%s\" in partition \"%s\"",
15992+
NameStr(trigForm->tgname), RelationGetRelationName(partition));
15993+
15994+
p = (char *) VARDATA_ANY(DatumGetByteaPP(value));
15995+
15996+
for (int i = 0; i < trigForm->tgnargs; i++)
15997+
{
15998+
trigargs = lappend(trigargs, makeString(pstrdup(p)));
15999+
p += strlen(p) + 1;
16000+
}
16001+
}
16002+
1598216003
trigStmt = makeNode(CreateTrigStmt);
1598316004
trigStmt->trigname = NameStr(trigForm->tgname);
1598416005
trigStmt->relation = NULL;
1598516006
trigStmt->funcname = NULL;/* passed separately */
15986-
trigStmt->args =NULL;/* passed separately */
16007+
trigStmt->args =trigargs;
1598716008
trigStmt->row = true;
1598816009
trigStmt->timing = trigForm->tgtype & TRIGGER_TYPE_TIMING_MASK;
1598916010
trigStmt->events = trigForm->tgtype & TRIGGER_TYPE_EVENT_MASK;

‎src/backend/commands/trigger.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,6 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
11721172
*/
11731173
childStmt= (CreateTrigStmt*)copyObject(stmt);
11741174
childStmt->funcname=NIL;
1175-
childStmt->args=NIL;
11761175
childStmt->whenClause=NULL;
11771176

11781177
/* If there is a WHEN clause, create a modified copy of it */

‎src/test/regress/expected/triggers.out

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,6 +2094,30 @@ NOTICE: trigger zzz on parted_trig_1_1 AFTER INSERT for ROW
20942094
NOTICE: trigger bbb on parted_trig_2 AFTER INSERT for ROW
20952095
NOTICE: trigger zzz on parted_trig_2 AFTER INSERT for ROW
20962096
drop table parted_trig;
2097+
-- Verify propagation of trigger arguments to partitions
2098+
create table parted_trig (a int) partition by list (a);
2099+
create table parted_trig1 partition of parted_trig for values in (1);
2100+
create or replace function trigger_notice() returns trigger as $$
2101+
declare
2102+
arg1 text = TG_ARGV[0];
2103+
arg2 integer = TG_ARGV[1];
2104+
begin
2105+
raise notice 'trigger % on % % % for % args % %',
2106+
TG_NAME, TG_TABLE_NAME, TG_WHEN, TG_OP, TG_LEVEL, arg1, arg2;
2107+
return null;
2108+
end;
2109+
$$ language plpgsql;
2110+
create trigger aaa after insert on parted_trig
2111+
for each row execute procedure trigger_notice('quirky', 1);
2112+
-- Verify propagation of trigger arguments to partitions attached after creating trigger
2113+
create table parted_trig2 partition of parted_trig for values in (2);
2114+
create table parted_trig3 (like parted_trig);
2115+
alter table parted_trig attach partition parted_trig3 for values in (3);
2116+
insert into parted_trig values (1), (2), (3);
2117+
NOTICE: trigger aaa on parted_trig1 AFTER INSERT for ROW args quirky 1
2118+
NOTICE: trigger aaa on parted_trig2 AFTER INSERT for ROW args quirky 1
2119+
NOTICE: trigger aaa on parted_trig3 AFTER INSERT for ROW args quirky 1
2120+
drop table parted_trig;
20972121
-- test irregular partitions (i.e., different column definitions),
20982122
-- including that the WHEN clause works
20992123
create function bark(text) returns bool language plpgsql immutable

‎src/test/regress/sql/triggers.sql

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,6 +1460,29 @@ create trigger qqq after insert on parted_trig_1_1 for each row execute procedur
14601460
insert into parted_trigvalues (50), (1500);
14611461
droptable parted_trig;
14621462

1463+
-- Verify propagation of trigger arguments to partitions
1464+
createtableparted_trig (aint) partition by list (a);
1465+
createtableparted_trig1 partition of parted_trig forvaluesin (1);
1466+
create or replacefunctiontrigger_notice() returns triggeras $$
1467+
declare
1468+
arg1text= TG_ARGV[0];
1469+
arg2integer= TG_ARGV[1];
1470+
begin
1471+
raise notice'trigger % on % % % for % args % %',
1472+
TG_NAME, TG_TABLE_NAME, TG_WHEN, TG_OP, TG_LEVEL, arg1, arg2;
1473+
returnnull;
1474+
end;
1475+
$$ language plpgsql;
1476+
createtriggeraaa after inserton parted_trig
1477+
for each row execute procedure trigger_notice('quirky',1);
1478+
1479+
-- Verify propagation of trigger arguments to partitions attached after creating trigger
1480+
createtableparted_trig2 partition of parted_trig forvaluesin (2);
1481+
createtableparted_trig3 (like parted_trig);
1482+
altertable parted_trig attach partition parted_trig3 forvaluesin (3);
1483+
insert into parted_trigvalues (1), (2), (3);
1484+
droptable parted_trig;
1485+
14631486
-- test irregular partitions (i.e., different column definitions),
14641487
-- including that the WHEN clause works
14651488
createfunctionbark(text) returns bool language plpgsql immutable

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp