diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-09-10 18:40:09 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-09-10 18:40:09 +0000 |
| commit | b339d1fff6c2f14776af29a35c8550b222ca70b2 (patch) | |
| tree | be0ed19fa78e35cdde627d1c6bc4c4be9f7cb44e /src/backend/commands/copy.c | |
| parent | 856d1faac1024717b7c37665c46fd635dc52b1b4 (diff) | |
| download | postgresql-b339d1fff6c2f14776af29a35c8550b222ca70b2.tar.gz postgresql-b339d1fff6c2f14776af29a35c8550b222ca70b2.zip | |
Fire non-deferred AFTER triggers immediately upon query completion,
rather than when returning to the idle loop. This makes no particular
difference for interactively-issued queries, but it makes a big difference
for queries issued within functions: trigger execution now occurs before
the calling function is allowed to proceed. This responds to numerous
complaints about nonintuitive behavior of foreign key checking, such as
http://archives.postgresql.org/pgsql-bugs/2004-09/msg00020.php, and
appears to be required by the SQL99 spec.
Also take the opportunity to simplify the data structures used for the
pending-trigger list, rename them for more clarity, and squeeze out a
bit of space.
Diffstat (limited to 'src/backend/commands/copy.c')
| -rw-r--r-- | src/backend/commands/copy.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 5793c0b2bbb..b25c8eee98c 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.230 2004/08/29 05:06:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.231 2004/09/10 18:39:56 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1611,6 +1611,11 @@ CopyFrom(Relation rel, List *attnumlist, bool binary, bool oids, } /* + * Prepare to catch AFTER triggers. + */ + AfterTriggerBeginQuery(); + + /* * Check BEFORE STATEMENT insertion triggers. It's debateable whether * we should do this for COPY, since it's not really an "INSERT" * statement as such. However, executing these triggers maintains @@ -1974,6 +1979,11 @@ CopyFrom(Relation rel, List *attnumlist, bool binary, bool oids, */ ExecASInsertTriggers(estate, resultRelInfo); + /* + * Handle queued AFTER triggers + */ + AfterTriggerEndQuery(); + pfree(values); pfree(nulls); |