COPY should handle after-insert triggers the same as execMain.c does.

tglsfdc · tglsfdc · commit c9f26d7af653 · 2001-03-14T21:47:50.000Z
I'm not sure that it's really necessary to save insert events when there
are only after update or delete triggers, but certainly it's wrong for
COPY to behave differently from an INSERT query.
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.133 2001/01/29 00:39:20 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.134 2001/03/14 21:47:50 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -877,12 +877,12 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp,
 
 		if (!skip_tuple)
 		{
+			ExecStoreTuple(tuple, slot, InvalidBuffer, false);
+
 			/* ----------------
 			 * Check the constraints of the tuple
 			 * ----------------
 			 */
-			ExecStoreTuple(tuple, slot, InvalidBuffer, false);
-
 			if (rel->rd_att->constr)
 				ExecConstraints("CopyFrom", resultRelInfo, slot, estate);
 
@@ -896,8 +896,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp,
 				ExecInsertIndexTuples(slot, &(tuple->t_self), estate, false);
 
 			/* AFTER ROW INSERT Triggers */
-			if (rel->trigdesc &&
-				rel->trigdesc->n_after_row[TRIGGER_EVENT_INSERT] > 0)
+			if (rel->trigdesc)
 				ExecARInsertTriggers(estate, rel, tuple);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.133 2001/01/29 00:39:20 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.134 2001/03/14 21:47:50 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -877,12 +877,12 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp,`
`877`	`877`
`878`	`878`	`if (!skip_tuple)`
`879`	`879`	`{`
	`880`	`+ ExecStoreTuple(tuple, slot, InvalidBuffer, false);`
	`881`	`+`
`880`	`882`	`/* ----------------`
`881`	`883`	`* Check the constraints of the tuple`
`882`	`884`	`* ----------------`
`883`	`885`	`*/`
`884`		`- ExecStoreTuple(tuple, slot, InvalidBuffer, false);`
`885`		`-`
`886`	`886`	`if (rel->rd_att->constr)`
`887`	`887`	`ExecConstraints("CopyFrom", resultRelInfo, slot, estate);`
`888`	`888`
`@@ -896,8 +896,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp,`
`896`	`896`	`ExecInsertIndexTuples(slot, &(tuple->t_self), estate, false);`
`897`	`897`
`898`	`898`	`/* AFTER ROW INSERT Triggers */`
`899`		`- if (rel->trigdesc &&`
`900`		`- rel->trigdesc->n_after_row[TRIGGER_EVENT_INSERT] > 0)`
	`899`	`+ if (rel->trigdesc)`
`901`	`900`	`ExecARInsertTriggers(estate, rel, tuple);`
`902`	`901`	`}`
`903`	`902`