AttrConstr --> TupleConstr

4 files changed, 36 insertions, 21 deletions

diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index a8671f94327..6414ff036e0 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.16 1997/08/21 03:01:15 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.17 1997/08/21 04:03:34 vadim Exp $
  *
  * NOTES
  *    some of the executor utility code such as "ExecTypeFromTL" should be
@@ -119,8 +119,8 @@ CreateTupleDescCopy(TupleDesc tupdesc)
 		ATTRIBUTE_TUPLE_SIZE);
     }
     if (tupdesc->constr) {
-      desc->constr = (AttrConstr *) palloc(sizeof(struct attrConstr));
-      memmove(desc->constr, tupdesc->constr, sizeof(struct attrConstr));
+      desc->constr = (TupleConstr *) palloc(sizeof(TupleConstr));
+      memmove(desc->constr, tupdesc->constr, sizeof(TupleConstr));
     } else
       desc->constr = NULL;
     return desc;
@@ -179,7 +179,7 @@ TupleDescInitEntry(TupleDesc desc,
 	memset(att->attname.data,0,NAMEDATALEN);
 
     
-    att->attdisbursion  = 0;			/* dummy value */
+    att->attnvals  = 0;			/* dummy value */
     att->attcacheoff = 	-1;
     
     att->attnum = attributeNumber;
@@ -387,7 +387,7 @@ BuildDescForRelation(List *schema, char *relname)
 	/* This is for constraints */
 	if (entry->is_not_null) {
            if (!desc->constr)
-               desc->constr = (AttrConstr *) palloc(sizeof(struct attrConstr));
+               desc->constr = (TupleConstr *) palloc(sizeof(TupleConstr));
            desc->constr->has_not_null = true;
         } 
         desc->attrs[attnum-1]->attnotnull = entry->is_not_null;
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index 28143a993b6..c343e073703 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.12 1997/08/19 04:43:30 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.13 1997/08/21 04:05:22 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -276,7 +276,7 @@ MergeAttributes(List *schema, List *supers)
 	    AttributeTupleForm	attribute = tupleDesc->attrs[attrno];
 	    char *attributeName;
 	    char *attributeType;
-	    AttrConstr  constraints;
+	    TupleConstr  constraints;
 	    HeapTuple	tuple;
 	    ColumnDef	*def;
 	    TypeName	*typename;
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 8cb08e6ab12..fa52573b2db 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.17 1997/08/21 01:36:09 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.18 1997/08/21 04:09:51 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -500,7 +500,7 @@ RelationBuildTupleDesc(RelationBuildDescInfo buildinfo,
 	build_tupdesc_seq(buildinfo, relation, natts);
     else
     {
-    	relation->rd_att->constr = (AttrConstr *) palloc(sizeof(struct attrConstr));
+    	relation->rd_att->constr = (TupleConstr *) palloc(sizeof(TupleConstr));
     	relation->rd_att->constr->num_check = 0;
     	relation->rd_att->constr->num_defval = 0;
     	relation->rd_att->constr->has_not_null = false;
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index cad6d01abe0..a571e9a7dd7 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tupdesc.h,v 1.6 1997/08/19 04:45:20 vadim Exp $
+ * $Id: tupdesc.h,v 1.7 1997/08/21 04:10:25 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,23 +17,38 @@
 #include <access/attnum.h>
 #include <catalog/pg_attribute.h>
 
-typedef struct attrConstr {
-/*------------------------------------------------------------------------
-  This structure contains flags to the constraints of a tuple
-  ------------------------------------------------------------------------*/
-  bool    has_not_null;
-} AttrConstr;
 
+typedef struct attrDefault {
+    AttrNumber		adnum;
+    char		*adbin;
+    char		*adsrc;
+} AttrDefault;
+
+typedef struct constrCheck {
+    char		*ccname;
+    char		*ccbin;
+    char		*ccsrc;
+} ConstrCheck;
+
+/* This structure contains constraints of a tuple */
+typedef struct tupleConstr {
+    AttrDefault		*defval;
+    ConstrCheck		*check;
+    uint16		num_defval;
+    uint16		num_check;
+    bool		has_not_null;
+} TupleConstr;
+
+/*
+ * This structure contains all information (i.e. from Classes
+ * pg_attribute, pg_attrdef, pg_relcheck) for a tuple. 
+ */
 typedef struct tupleDesc {
-/*------------------------------------------------------------------------ 
-  This structure contains all the attribute information (i.e. from Class 
-  pg_attribute) for a tuple. 
--------------------------------------------------------------------------*/
     int  natts;      
       /* Number of attributes in the tuple */
     AttributeTupleForm *attrs;
       /* attrs[N] is a pointer to the description of Attribute Number N+1.  */
-    AttrConstr *constr;
+    TupleConstr *constr;
 } *TupleDesc;
 
 extern TupleDesc CreateTemplateTupleDesc(int natts);