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

Commitcaaf2e8

Browse files
committed
Fix sloppy usage of TRIGGER_FIRED_BEFORE/TRIGGER_FIRED_AFTER.
Various places were testing TRIGGER_FIRED_BEFORE() where what they reallymeant was !TRIGGER_FIRED_AFTER(), or vice versa. This needs to be cleanedup because there are about to be more than two possible states.We might want to note this in the 9.1 release notes as something fortrigger authors to double-check.For consistency's sake I also changed some places that assumed thatTRIGGER_FIRED_FOR_ROW and TRIGGER_FIRED_FOR_STATEMENT are necessarilymutually exclusive; that's not in immediate danger of breaking, butit's still sloppier than it should be.Extracted from Dean Rasheed's patch for triggers on views. I'm committingthis separately since it's an identifiable separate issue, and is theonly reason for the patch to touch most of these particular files.
1 parent56ccff5 commitcaaf2e8

File tree

9 files changed

+25
-26
lines changed

9 files changed

+25
-26
lines changed

‎contrib/spi/autoinc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ autoinc(PG_FUNCTION_ARGS)
3535
if (!CALLED_AS_TRIGGER(fcinfo))
3636
/* internal error */
3737
elog(ERROR,"not fired by trigger manager");
38-
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
38+
if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
3939
/* internal error */
40-
elog(ERROR,"cannot process STATEMENT events");
41-
if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
40+
elog(ERROR,"must be fired for row");
41+
if (!TRIGGER_FIRED_BEFORE(trigdata->tg_event))
4242
/* internal error */
4343
elog(ERROR,"must be fired before event");
4444

‎contrib/spi/insert_username.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ insert_username(PG_FUNCTION_ARGS)
3838
if (!CALLED_AS_TRIGGER(fcinfo))
3939
/* internal error */
4040
elog(ERROR,"insert_username: not fired by trigger manager");
41-
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
41+
if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
4242
/* internal error */
43-
elog(ERROR,"insert_username:cannot process STATEMENT events");
44-
if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
43+
elog(ERROR,"insert_username:must be fired for row");
44+
if (!TRIGGER_FIRED_BEFORE(trigdata->tg_event))
4545
/* internal error */
4646
elog(ERROR,"insert_username: must be fired before event");
4747

‎contrib/spi/moddatetime.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ moddatetime(PG_FUNCTION_ARGS)
4343
/* internal error */
4444
elog(ERROR,"moddatetime: not fired by trigger manager");
4545

46-
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
46+
if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
4747
/* internal error */
48-
elog(ERROR,"moddatetime:cannot process STATEMENT events");
48+
elog(ERROR,"moddatetime:must be fired for row");
4949

50-
if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
50+
if (!TRIGGER_FIRED_BEFORE(trigdata->tg_event))
5151
/* internal error */
5252
elog(ERROR,"moddatetime: must be fired before event");
5353

5454
if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
5555
/* internal error */
56-
elog(ERROR,"moddatetime:must be fired before event");
56+
elog(ERROR,"moddatetime:cannot process INSERT events");
5757
elseif (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
5858
rettuple=trigdata->tg_newtuple;
5959
else

‎contrib/spi/refint.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ check_primary_key(PG_FUNCTION_ARGS)
7979
elog(ERROR,"check_primary_key: not fired by trigger manager");
8080

8181
/* Should be called for ROW trigger */
82-
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
82+
if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
8383
/* internal error */
84-
elog(ERROR,"check_primary_key:cannot process STATEMENT events");
84+
elog(ERROR,"check_primary_key:must be fired for row");
8585

8686
/* If INSERTion then must check Tuple to being inserted */
8787
if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
@@ -279,9 +279,9 @@ check_foreign_key(PG_FUNCTION_ARGS)
279279
elog(ERROR,"check_foreign_key: not fired by trigger manager");
280280

281281
/* Should be called for ROW trigger */
282-
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
282+
if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
283283
/* internal error */
284-
elog(ERROR,"check_foreign_key:cannot process STATEMENT events");
284+
elog(ERROR,"check_foreign_key:must be fired for row");
285285

286286
/* Not should be called for INSERT */
287287
if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))

‎contrib/spi/timetravel.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ timetravel(PG_FUNCTION_ARGS)
118118
elog(ERROR,"timetravel: not fired by trigger manager");
119119

120120
/* Should be called for ROW trigger */
121-
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
122-
elog(ERROR,"timetravel:cannot process STATEMENT events");
121+
if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
122+
elog(ERROR,"timetravel:must be fired for row");
123123

124124
/* Should be called BEFORE */
125-
if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
125+
if (!TRIGGER_FIRED_BEFORE(trigdata->tg_event))
126126
elog(ERROR,"timetravel: must be fired before event");
127127

128128
/* INSERT ? */

‎src/backend/utils/adt/tsvector_op.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,9 +1257,9 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
12571257
elog(ERROR,"tsvector_update_trigger: not fired by trigger manager");
12581258

12591259
trigdata= (TriggerData*)fcinfo->context;
1260-
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
1261-
elog(ERROR,"tsvector_update_trigger:can't process STATEMENT events");
1262-
if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
1260+
if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
1261+
elog(ERROR,"tsvector_update_trigger:must be fired for row");
1262+
if (!TRIGGER_FIRED_BEFORE(trigdata->tg_event))
12631263
elog(ERROR,"tsvector_update_trigger: must be fired BEFORE event");
12641264

12651265
if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))

‎src/pl/plpgsql/src/pl_exec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ plpgsql_exec_trigger(PLpgSQL_function *func,
526526
rec_old->tupdesc=trigdata->tg_relation->rd_att;
527527
rec_old->freetupdesc= false;
528528

529-
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
529+
if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
530530
{
531531
/*
532532
* Per-statement triggers don't use OLD/NEW variables
@@ -715,7 +715,7 @@ plpgsql_exec_trigger(PLpgSQL_function *func,
715715
* attributes don't have the correct atttypmod's length. It's up to the
716716
* trigger's programmer to ensure that this doesn't happen. Jan
717717
*/
718-
if (estate.retisnull||TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
718+
if (estate.retisnull||!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
719719
rettup=NULL;
720720
else
721721
{

‎src/pl/plpython/plpython.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,6 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc, HeapTuple *r
841841
Py_DECREF(plttableschema);
842842
pfree(stroid);
843843

844-
845844
if (TRIGGER_FIRED_BEFORE(tdata->tg_event))
846845
pltwhen=PyString_FromString("BEFORE");
847846
elseif (TRIGGER_FIRED_AFTER(tdata->tg_event))

‎src/test/regress/regress.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,9 @@ ttdummy(PG_FUNCTION_ARGS)
487487

488488
if (!CALLED_AS_TRIGGER(fcinfo))
489489
elog(ERROR,"ttdummy: not fired by trigger manager");
490-
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
491-
elog(ERROR,"ttdummy:cannot process STATEMENT events");
492-
if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
490+
if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
491+
elog(ERROR,"ttdummy:must be fired for row");
492+
if (!TRIGGER_FIRED_BEFORE(trigdata->tg_event))
493493
elog(ERROR,"ttdummy: must be fired before event");
494494
if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
495495
elog(ERROR,"ttdummy: cannot process INSERT event");

0 commit comments

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