diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index e0601c4cb62bc9fa63d9d107f0bf776f7bb8962b..da07ebcacbe70a53b8dd15da8594023a60c045c1 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_attribute.h,v 1.13 1997/08/31 09:55:21 vadim Exp $
+ * $Id: pg_attribute.h,v 1.14 1997/09/04 13:25:08 vadim Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -534,14 +534,11 @@ DATA(insert OID = 0 ( 1216 vtype 18 0 1 -11 0 -1 t f c f f));
*/
DATA(insert OID = 0 ( 1219 tgrelid 26 0 4 1 0 -1 t f i f f));
DATA(insert OID = 0 ( 1219 tgname 19 0 NAMEDATALEN 2 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1219 tgfunc 19 0 NAMEDATALEN 3 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1219 tglang 26 0 4 4 0 -1 t f i f f));
-DATA(insert OID = 0 ( 1219 tgtype 21 0 2 5 0 -1 t f s f f));
-DATA(insert OID = 0 ( 1219 tgnargs 21 0 2 6 0 -1 t f s f f));
-DATA(insert OID = 0 ( 1219 tgattr 22 0 16 7 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1219 tgtext 17 0 -1 8 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1219 tgargs 17 0 -1 9 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1219 tgwhen 25 0 -1 10 0 -1 f f i f f));
+DATA(insert OID = 0 ( 1219 tgfoid 26 0 4 3 0 -1 t f i f f));
+DATA(insert OID = 0 ( 1219 tgtype 21 0 2 4 0 -1 t f s f f));
+DATA(insert OID = 0 ( 1219 tgnargs 21 0 2 5 0 -1 t f s f f));
+DATA(insert OID = 0 ( 1219 tgattr 22 0 16 6 0 -1 f f i f f));
+DATA(insert OID = 0 ( 1219 tgargs 17 0 -1 7 0 -1 f f i f f));
DATA(insert OID = 0 ( 1219 ctid 27 0 6 -1 0 -1 f f i f f));
DATA(insert OID = 0 ( 1219 oid 26 0 4 -2 0 -1 t f i f f));
DATA(insert OID = 0 ( 1219 xmin 28 0 4 -3 0 -1 f f i f f));
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index b119ebbd7738bdb569e9303bddbfb635c85e8e16..e595f8fbbc6b8ea81370bb1eb22c01f5c079c9d3 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_class.h,v 1.8 1997/08/31 09:55:22 vadim Exp $
+ * $Id: pg_class.h,v 1.9 1997/09/04 13:25:13 vadim Exp $
*
* NOTES
* ``pg_relation'' is being replaced by ``pg_class''. currently
@@ -139,7 +139,7 @@ DATA(insert OID = 1271 ( pg_time 100 PGUID 0 0 0 0 0 f t s n 1 0 0 0 f
DATA(insert OID = 1273 ( pg_hosts 101 PGUID 0 0 0 0 0 f t s n 3 0 0 0 f _null_ ));
DATA(insert OID = 1215 ( pg_attrdef 109 PGUID 0 0 0 0 0 t t r n 4 0 0 0 f _null_ ));
DATA(insert OID = 1216 ( pg_relcheck 110 PGUID 0 0 0 0 0 t t r n 4 0 0 0 f _null_ ));
-DATA(insert OID = 1219 ( pg_trigger 111 PGUID 0 0 0 0 0 t t r n 10 0 0 0 f _null_ ));
+DATA(insert OID = 1219 ( pg_trigger 111 PGUID 0 0 0 0 0 t t r n 7 0 0 0 f _null_ ));
#define RelOid_pg_type 1247
#define RelOid_pg_demon 1251
diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h
index 7a6d72a0acc6769617583ef45774c417cbce51a0..7c675b73db3de9619e5ad096ff619aad449e9bab 100644
--- a/src/include/catalog/pg_trigger.h
+++ b/src/include/catalog/pg_trigger.h
@@ -29,14 +29,11 @@
CATALOG(pg_trigger) BOOTSTRAP {
Oid tgrelid; /* triggered relation */
NameData tgname; /* trigger' name */
- NameData tgfunc; /* name of function to be called */
- Oid tglang; /* Language. Only ClanguageId currently */
+ Oid tgfoid; /* OID of function to be called */
int2 tgtype; /* BEFORE/AFTER UPDATE/DELETE/INSERT ROW/STATEMENT */
int2 tgnargs; /* # of extra arguments in tgargs */
int28 tgattr; /* UPDATE of attr1, attr2 ... (NI) */
- bytea tgtext; /* currently, where to find .so */
bytea tgargs; /* first\000second\000tgnargs\000 */
- text tgwhen; /* when (a > 10 or b = 3) fire trigger (NI) */
} FormData_pg_trigger;
/* ----------------
@@ -50,17 +47,14 @@ typedef FormData_pg_trigger *Form_pg_trigger;
* compiler constants for pg_trigger
* ----------------
*/
-#define Natts_pg_trigger 10
+#define Natts_pg_trigger 7
#define Anum_pg_trigger_tgrelid 1
#define Anum_pg_trigger_tgname 2
-#define Anum_pg_trigger_tgfunc 3
-#define Anum_pg_trigger_tglang 4
-#define Anum_pg_trigger_tgtype 5
-#define Anum_pg_trigger_tgnargs 6
-#define Anum_pg_trigger_tgattr 7
-#define Anum_pg_trigger_tgtext 8
-#define Anum_pg_trigger_tgargs 9
-#define Anum_pg_trigger_tgwhen 10
+#define Anum_pg_trigger_tgfoid 3
+#define Anum_pg_trigger_tgtype 4
+#define Anum_pg_trigger_tgnargs 5
+#define Anum_pg_trigger_tgattr 6
+#define Anum_pg_trigger_tgargs 7
#define TRIGGER_TYPE_ROW (1 << 0)
#define TRIGGER_TYPE_BEFORE (1 << 1)