Un-break triggers declared for INSERT OR DELETE OR UPDATE. This worked

tglsfdc · tglsfdc · commit 0aa5b6866e5f · 2002-11-25T03:36:50.000Z
okay in 7.3, so I think it must have been busted in the recent triggers
patch.
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.140 2002/11/23 03:59:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.141 2002/11/25 03:36:50 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -199,7 +199,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint)
 	if (stmt->row)
 		TRIGGER_SETT_ROW(tgtype);
 
-	for (i = 0; i < 2 && stmt->actions[i]; i++)
+	for (i = 0; stmt->actions[i]; i++)
 	{
 		switch (stmt->actions[i])
 		{
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.381 2002/11/23 03:59:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.382 2002/11/25 03:36:50 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -2027,7 +2027,7 @@ CreateTrigStmt:
 					n->args = $13;
 					n->before = $4;
 					n->row = $8;
-					memcpy (n->actions, $5, 4);
+					memcpy(n->actions, $5, 4);
 					n->isconstraint  = FALSE;
 					n->deferrable	 = FALSE;
 					n->initdeferred  = FALSE;
@@ -2047,7 +2047,7 @@ CreateTrigStmt:
 					n->args = $18;
 					n->before = FALSE;
 					n->row = TRUE;
-					memcpy (n->actions, $6, 4);
+					memcpy(n->actions, $6, 4);
 					n->isconstraint  = TRUE;
 					n->deferrable = ($10 & 1) != 0;
 					n->initdeferred = ($10 & 2) != 0;
@@ -2066,17 +2066,19 @@ TriggerEvents:
 			TriggerOneEvent
 				{
 					char *e = palloc(4);
-					e[0] = $1; e[1] = 0; $$ = e;
+					e[0] = $1; e[1] = '\0';
+					$$ = e;
 				}
 			| TriggerOneEvent OR TriggerOneEvent
 				{
 					char *e = palloc(4);
-					e[0] = $1; e[1] = $3; e[2] = 0; $$ = e;
+					e[0] = $1; e[1] = $3; e[2] = '\0';
+					$$ = e;
 				}
 			| TriggerOneEvent OR TriggerOneEvent OR TriggerOneEvent
 				{
 					char *e = palloc(4);
-					e[0] = $1; e[1] = $3; e[2] = $5; e[3] = 0;
+					e[0] = $1; e[1] = $3; e[2] = $5; e[3] = '\0';
 					$$ = e;
 				}
 		;
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsenodes.h,v 1.217 2002/11/23 03:59:09 momjian Exp $
+ * $Id: parsenodes.h,v 1.218 2002/11/25 03:36:50 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1048,7 +1048,7 @@ typedef struct CreateTrigStmt
 	List	   *args;			/* list of (T_String) Values or NIL */
 	bool		before;			/* BEFORE/AFTER */
 	bool		row;			/* ROW/STATEMENT */
-	char		actions[3];		/* Insert, Update, Delete */
+	char		actions[4];		/* 1 to 3 of 'i', 'u', 'd', + trailing \0 */
 
 	/* The following are used for referential */
 	/* integrity constraint triggers */

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.140 2002/11/23 03:59:07 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.141 2002/11/25 03:36:50 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -199,7 +199,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint)`
`199`	`199`	`if (stmt->row)`
`200`	`200`	`TRIGGER_SETT_ROW(tgtype);`
`201`	`201`
`202`		`- for (i = 0; i < 2 && stmt->actions[i]; i++)`
	`202`	`+ for (i = 0; stmt->actions[i]; i++)`
`203`	`203`	`{`
`204`	`204`	`switch (stmt->actions[i])`
`205`	`205`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.381 2002/11/23 03:59:08 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.382 2002/11/25 03:36:50 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -2027,7 +2027,7 @@ CreateTrigStmt:`
`2027`	`2027`	`n->args = $13;`
`2028`	`2028`	`n->before = $4;`
`2029`	`2029`	`n->row = $8;`
`2030`		`- memcpy (n->actions, $5, 4);`
	`2030`	`+ memcpy(n->actions, $5, 4);`
`2031`	`2031`	`n->isconstraint = FALSE;`
`2032`	`2032`	`n->deferrable = FALSE;`
`2033`	`2033`	`n->initdeferred = FALSE;`
`@@ -2047,7 +2047,7 @@ CreateTrigStmt:`
`2047`	`2047`	`n->args = $18;`
`2048`	`2048`	`n->before = FALSE;`
`2049`	`2049`	`n->row = TRUE;`
`2050`		`- memcpy (n->actions, $6, 4);`
	`2050`	`+ memcpy(n->actions, $6, 4);`
`2051`	`2051`	`n->isconstraint = TRUE;`
`2052`	`2052`	`n->deferrable = ($10 & 1) != 0;`
`2053`	`2053`	`n->initdeferred = ($10 & 2) != 0;`
`@@ -2066,17 +2066,19 @@ TriggerEvents:`
`2066`	`2066`	`TriggerOneEvent`
`2067`	`2067`	`{`
`2068`	`2068`	`char *e = palloc(4);`
`2069`		`- e[0] = $1; e[1] = 0; $$ = e;`
	`2069`	`+ e[0] = $1; e[1] = '\0';`
	`2070`	`+ $$ = e;`
`2070`	`2071`	`}`
`2071`	`2072`	`\| TriggerOneEvent OR TriggerOneEvent`
`2072`	`2073`	`{`
`2073`	`2074`	`char *e = palloc(4);`
`2074`		`- e[0] = $1; e[1] = $3; e[2] = 0; $$ = e;`
	`2075`	`+ e[0] = $1; e[1] = $3; e[2] = '\0';`
	`2076`	`+ $$ = e;`
`2075`	`2077`	`}`
`2076`	`2078`	`\| TriggerOneEvent OR TriggerOneEvent OR TriggerOneEvent`
`2077`	`2079`	`{`
`2078`	`2080`	`char *e = palloc(4);`
`2079`		`- e[0] = $1; e[1] = $3; e[2] = $5; e[3] = 0;`
	`2081`	`+ e[0] = $1; e[1] = $3; e[2] = $5; e[3] = '\0';`
`2080`	`2082`	`$$ = e;`
`2081`	`2083`	`}`
`2082`	`2084`	`;`