summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorJan Wieck2000-01-06 20:47:01 +0000
committerJan Wieck2000-01-06 20:47:01 +0000
commitb7b6d4bf532512bea7ceb46b6250f9f617948ef4 (patch)
treef299c2740c569369c60878c1f7c3995fe83048f5 /src/include
parent88016a564a20276472f02a2fd98ec9fc7d968c4f (diff)
Changed "triggered data change violation" detection code
in trigger manager. Jan
Diffstat (limited to 'src/include')
-rw-r--r--src/include/catalog/pg_proc.h6
-rw-r--r--src/include/commands/trigger.h10
-rw-r--r--src/include/utils/builtins.h4
3 files changed, 17 insertions, 3 deletions
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index be62e108d4a..abb03c76f8a 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_proc.h,v 1.110 1999/12/28 13:40:50 wieck Exp $
+ * $Id: pg_proc.h,v 1.111 2000/01/06 20:46:54 wieck Exp $
*
* NOTES
* The script catalog/genbki.sh reads this file and generates .bki
@@ -2142,6 +2142,10 @@ DATA(insert OID = 1652 ( RI_FKey_setdefault_del PGUID 11 f t f 0 f 0 "" 100 0 0
DESCR("referential integrity ON DELETE SET DEFAULT");
DATA(insert OID = 1653 ( RI_FKey_setdefault_upd PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_setdefault_upd - ));
DESCR("referential integrity ON UPDATE SET DEFAULT");
+DATA(insert OID = 1654 ( RI_FKey_noaction_del PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_setdefault_del - ));
+DESCR("referential integrity ON DELETE NO ACTION");
+DATA(insert OID = 1655 ( RI_FKey_noaction_upd PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_setdefault_upd - ));
+DESCR("referential integrity ON UPDATE NO ACTION");
/* for mac type support */
DATA(insert OID = 436 ( macaddr_in PGUID 11 f t t 1 f 829 "0" 100 0 0 100 macaddr_in - ));
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index 8ab4342fa7a..ddb9f7ca5b4 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -37,7 +37,9 @@ extern DLLIMPORT TriggerData *CurrentTriggerData;
#define TRIGGER_DEFERRED_DEFERRABLE 0x00000040
#define TRIGGER_DEFERRED_INITDEFERRED 0x00000080
#define TRIGGER_DEFERRED_HAS_BEFORE 0x00000100
-#define TRIGGER_DEFERRED_MASK 0x000001F0
+#define TRIGGER_DEFERRED_ROW_INSERTED 0x00000200
+#define TRIGGER_DEFERRED_KEY_CHANGED 0x00000400
+#define TRIGGER_DEFERRED_MASK 0x000007F0
#define TRIGGER_FIRED_BY_INSERT(event) \
(((TriggerEvent) (event) & TRIGGER_EVENT_OPMASK) == \
@@ -117,4 +119,10 @@ extern void DeferredTriggerSaveEvent(Relation rel, int event,
HeapTuple oldtup, HeapTuple newtup);
+/*
+ * in utils/adt/ri_triggers.c
+ *
+ */
+extern bool RI_FKey_keyequal_upd(void);
+
#endif /* TRIGGER_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 4486131d416..eca5f42d33a 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: builtins.h,v 1.93 1999/12/28 13:40:52 wieck Exp $
+ * $Id: builtins.h,v 1.94 2000/01/06 20:47:01 wieck Exp $
*
* NOTES
* This should normally only be included by fmgr.h.
@@ -623,6 +623,8 @@ float64 numeric_float8(Numeric num);
/* ri_triggers.c */
HeapTuple RI_FKey_check_ins(FmgrInfo *proinfo);
HeapTuple RI_FKey_check_upd(FmgrInfo *proinfo);
+HeapTuple RI_FKey_noaction_del(FmgrInfo *proinfo);
+HeapTuple RI_FKey_noaction_upd(FmgrInfo *proinfo);
HeapTuple RI_FKey_cascade_del(FmgrInfo *proinfo);
HeapTuple RI_FKey_cascade_upd(FmgrInfo *proinfo);
HeapTuple RI_FKey_restrict_del(FmgrInfo *proinfo);