summaryrefslogtreecommitdiff
path: root/src/backend/parser
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2002-11-25 03:36:50 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2002-11-25 03:36:50 +0000
commit0aa5b6866e5f72f094b79ff41c5d36d81800f964 (patch)
treedf5f74da6d65ebcf0fae33167f575466ea3e9d67 /src/backend/parser
parent2eafcf68d563df8a1db80a6fe1cf50ec588b4f34 (diff)
downloadpostgresql-0aa5b6866e5f72f094b79ff41c5d36d81800f964.tar.gz
Un-break triggers declared for INSERT OR DELETE OR UPDATE. This worked
okay in 7.3, so I think it must have been busted in the recent triggers patch.
Diffstat (limited to 'src/backend/parser')
-rw-r--r--src/backend/parser/gram.y14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 29cba53f9f..df09e0177c 100644
--- 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;
}
;