mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plperl trigger handler tried to fetch new/old tuples even when fired

Browse Source 
as a statement trigger :-(.  Per report from Sokolov Yura.
This commit is contained in:
Tom Lane 2005-01-14 16:25:42 +00:00
parent 75112d4b5d
commit ce6e2fada0
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pl/plperl/plperl.c
View File

@ -33,7 +33,7 @@
* ENHANCEMENTS, OR MODIFICATIONS. * ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.66 2005/01/11 06:08:45 tgl Exp $ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.67 2005/01/14 16:25:42 tgl Exp $
* *
**********************************************************************/ **********************************************************************/
@ -338,6 +338,7 @@ plperl_trigger_build_args(FunctionCallInfo fcinfo)
if (TRIGGER_FIRED_BY_INSERT(tdata->tg_event)) if (TRIGGER_FIRED_BY_INSERT(tdata->tg_event))
{ {
event = "INSERT"; event = "INSERT";
if (TRIGGER_FIRED_FOR_ROW(tdata->tg_event))
hv_store(hv, "new", 3, hv_store(hv, "new", 3,
plperl_hash_from_tuple(tdata->tg_trigtuple, tupdesc), plperl_hash_from_tuple(tdata->tg_trigtuple, tupdesc),
0); 0);
@ -345,6 +346,7 @@ plperl_trigger_build_args(FunctionCallInfo fcinfo)
else if (TRIGGER_FIRED_BY_DELETE(tdata->tg_event)) else if (TRIGGER_FIRED_BY_DELETE(tdata->tg_event))
{ {
event = "DELETE"; event = "DELETE";
if (TRIGGER_FIRED_FOR_ROW(tdata->tg_event))
hv_store(hv, "old", 3, hv_store(hv, "old", 3,
plperl_hash_from_tuple(tdata->tg_trigtuple, tupdesc), plperl_hash_from_tuple(tdata->tg_trigtuple, tupdesc),
0); 0);
@ -352,6 +354,8 @@ plperl_trigger_build_args(FunctionCallInfo fcinfo)
else if (TRIGGER_FIRED_BY_UPDATE(tdata->tg_event)) else if (TRIGGER_FIRED_BY_UPDATE(tdata->tg_event))
{ {
event = "UPDATE"; event = "UPDATE";
if (TRIGGER_FIRED_FOR_ROW(tdata->tg_event))
{
hv_store(hv, "old", 3, hv_store(hv, "old", 3,
plperl_hash_from_tuple(tdata->tg_trigtuple, tupdesc), plperl_hash_from_tuple(tdata->tg_trigtuple, tupdesc),
0); 0);
@ -359,14 +363,14 @@ plperl_trigger_build_args(FunctionCallInfo fcinfo)
plperl_hash_from_tuple(tdata->tg_newtuple, tupdesc), plperl_hash_from_tuple(tdata->tg_newtuple, tupdesc),
0); 0);
} }
else {
event = "UNKNOWN";
} }
else
event = "UNKNOWN";
hv_store(hv, "event", 5, newSVpv(event, 0), 0); hv_store(hv, "event", 5, newSVpv(event, 0), 0);
hv_store(hv, "argc", 4, newSViv(tdata->tg_trigger->tgnargs), 0); hv_store(hv, "argc", 4, newSViv(tdata->tg_trigger->tgnargs), 0);
if (tdata->tg_trigger->tgnargs != 0) if (tdata->tg_trigger->tgnargs > 0)
{ {
AV *av = newAV(); AV *av = newAV();
for (i=0; i < tdata->tg_trigger->tgnargs; i++) for (i=0; i < tdata->tg_trigger->tgnargs; i++)