Make large objects their own relkind type. Fix dups in pg_class_mb

files.  Fix sequence creation hack for relkind type.

src/backend/bootstrap/bootparse.y

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.18 1998/07/26 04:30:18 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.19 1998/08/06 05:12:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -177,10 +177,10 @@ Boot_CreateStmt:
 					{
 						Oid id;
 						TupleDesc tupdesc;
-						/* extern Oid heap_create_with_catalog();*/
 
 						tupdesc = CreateTupleDesc(numattr,attrtypes);
-						id = heap_create_with_catalog(LexIDStr($3), tupdesc);
+						id = heap_create_with_catalog(LexIDStr($3),
+												tupdesc, RELKIND_RELATION);
 						if (!Quiet)
 							printf("CREATED relation %s with OID %d\n",
 								   LexIDStr($3), id);

src/backend/catalog/heap.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.55 1998/07/27 19:37:46 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.56 1998/08/06 05:12:19 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		heap_create()			- Create an uncataloged heap relation
@@ -16,7 +16,7 @@
  *
  * NOTES
  *	  this code taken from access/heap/create.c, which contains
- *	  the old heap_create_with_catalogr, amcreate, and amdestroy.
+ *	  the old heap_create_with_catalog, amcreate, and amdestroy.
  *	  those routines will soon call these routines using the function
  *	  manager,
  *	  just like the poorly named "NewXXX" routines do.	The
@@ -65,7 +65,8 @@
 
 static void
 AddPgRelationTuple(Relation pg_class_desc,
-				 Relation new_rel_desc, Oid new_rel_oid, unsigned natts);
+				 Relation new_rel_desc, Oid new_rel_oid, unsigned natts,
+				 char relkind);
 static void AddToTempRelList(Relation r);
 static void DeletePgAttributeTuples(Relation rdesc);
 static void DeletePgRelationTuple(Relation rdesc);
@@ -345,7 +346,7 @@ heap_create(char *name,
  *		   preforms a scan to ensure that no relation with the
  *		   same name already exists.
  *
- *		3) heap_create_with_catalogr() is called to create the new relation
+ *		3) heap_create_with_catalog() is called to create the new relation
  *		   on disk.
  *
  *		4) TypeDefine() is called to define a new type corresponding
@@ -378,7 +379,7 @@ heap_create(char *name,
  *		create new relation
  *		insert new relation into attribute catalog
  *
- *		Should coordinate with heap_create_with_catalogr(). Either
+ *		Should coordinate with heap_create_with_catalog(). Either
  *		it should not be called or there should be a way to prevent
  *		the relation from being removed at the end of the
  *		transaction if it is successful ('u'/'r' may be enough).
@@ -633,14 +634,13 @@ static void
 AddPgRelationTuple(Relation pg_class_desc,
 				   Relation new_rel_desc,
 				   Oid new_rel_oid,
-				   unsigned natts)
+				   unsigned natts,
+				   char relkind)
 {
 	Form_pg_class new_rel_reltup;
 	HeapTuple	tup;
 	Relation	idescs[Num_pg_class_indices];
 	bool		isBootstrap;
-	extern bool ItsSequenceCreation;	/* It's hack, I know... - vadim
-										 * 03/28/97		*/
 
 	/* ----------------
 	 *	first we munge some of the information in our
@@ -653,10 +653,7 @@ AddPgRelationTuple(Relation pg_class_desc,
 	/* new_rel_reltup->reltuples = 1; *//* XXX */
 
 	new_rel_reltup->relowner = GetUserId();
-	if (ItsSequenceCreation)
-		new_rel_reltup->relkind = RELKIND_SEQUENCE;
-	else
-		new_rel_reltup->relkind = RELKIND_RELATION;
+	new_rel_reltup->relkind = relkind;
 	new_rel_reltup->relnatts = natts;
 
 	/* ----------------
@@ -747,8 +744,9 @@ addNewRelationType(char *typeName, Oid new_rel_oid)
  * --------------------------------
  */
 Oid
-heap_create_with_catalog(char relname[],
-						 TupleDesc tupdesc)
+heap_create_with_catalog(char *relname,
+						 TupleDesc tupdesc,
+						 char relkind)
 {
 	Relation	pg_class_desc;
 	Relation	new_rel_desc;
@@ -813,7 +811,8 @@ heap_create_with_catalog(char relname[],
 	AddPgRelationTuple(pg_class_desc,
 					   new_rel_desc,
 					   new_rel_oid,
-					   natts);
+					   natts,
+					   relkind);
 
 	StoreConstraints(new_rel_desc);
 

src/backend/commands/cluster.c

@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.26 1998/07/27 19:37:50 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.27 1998/08/06 05:12:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -218,7 +218,7 @@ copy_heap(Oid OIDOldHeap)
 
 	tupdesc = CreateTupleDescCopy(OldHeapDesc);
 
-	OIDNewHeap = heap_create_with_catalog(NewName, tupdesc);
+	OIDNewHeap = heap_create_with_catalog(NewName, tupdesc, RELKIND_RELATION);
 
 	if (!OidIsValid(OIDNewHeap))
 		elog(ERROR, "clusterheap: cannot create temporary heap relation\n");

src/backend/commands/creatinh.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.30 1998/06/15 19:28:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.31 1998/08/06 05:12:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,7 +45,7 @@ static void StoreCatalogInheritance(Oid relationId, List *supers);
  * ----------------------------------------------------------------
  */
 void
-DefineRelation(CreateStmt *stmt)
+DefineRelation(CreateStmt *stmt, char relkind)
 {
 	char	   *relname = palloc(NAMEDATALEN);
 	List	   *schema = stmt->tableElts;
@@ -137,7 +137,8 @@ DefineRelation(CreateStmt *stmt)
 		}
 	}
 
-	relationId = heap_create_with_catalog(relname, descriptor);
+	relationId = heap_create_with_catalog(relname,
+										  descriptor, relkind);
 
 	StoreCatalogInheritance(relationId, inheritList);
 }

src/backend/commands/recipe.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.21 1998/06/15 19:28:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.22 1998/08/06 05:12:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1032,7 +1032,8 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
 				tupdesc = rel->rd_att;
 
 				relid = heap_create_with_catalog(
-							 child->nodeElem->outTypes->val[0], tupdesc);
+										child->nodeElem->outTypes->val[0],
+										tupdesc, RELKIND_RELATION);
 			}
 			else
 			{
@@ -1055,7 +1056,8 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
 				else
 				{
 					relid = heap_create_with_catalog(
-							 child->nodeElem->outTypes->val[0], tupdesc);
+							 child->nodeElem->outTypes->val[0],
+							tupdesc, RELKIND_RELATION);
 				}
 			}
 		}

src/backend/commands/sequence.c

@@ -24,8 +24,6 @@
 #define SEQ_MAXVALUE	((int4)0x7FFFFFFF)
 #define SEQ_MINVALUE	-(SEQ_MAXVALUE)
 
-bool		ItsSequenceCreation = false;
-
 typedef struct FormData_pg_sequence
 {
 	NameData	sequence_name;
@@ -157,15 +155,7 @@ DefineSequence(CreateSeqStmt *seq)
 	stmt->inhRelnames = NIL;
 	stmt->constraints = NIL;
 
-	ItsSequenceCreation = true; /* hack */
-
-	DefineRelation(stmt);
-
-	/*
-	 * Xact abort calls CloseSequences, which turns ItsSequenceCreation
-	 * off
-	 */
-	ItsSequenceCreation = false;/* hack */
+	DefineRelation(stmt, RELKIND_SEQUENCE);
 
 	rel = heap_openr(seq->seqname);
 	Assert(RelationIsValid(rel));
@@ -438,8 +428,6 @@ CloseSequences(void)
 	SeqTable	elm;
 	Relation	rel;
 
-	ItsSequenceCreation = false;
-
 	for (elm = seqtab; elm != (SeqTable) NULL;)
 	{
 		if (elm->rel != (Relation) NULL)		/* opened in current xact */

src/backend/commands/view.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.23 1998/07/19 05:49:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.24 1998/08/06 05:12:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -105,7 +105,7 @@ DefineVirtualRelation(char *relname, List *tlist)
 	/*
 	 * finally create the relation...
 	 */
-	DefineRelation(&createStmt);
+	DefineRelation(&createStmt, RELKIND_RELATION);
 }
 
 /*------------------------------------------------------------------

src/backend/executor/execMain.c

@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.51 1998/07/27 19:37:55 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.52 1998/08/06 05:12:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -587,7 +587,8 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
 				 */
 				tupdesc = CreateTupleDescCopy(tupType);
 
-				intoRelationId = heap_create_with_catalog(intoName, tupdesc);
+				intoRelationId = heap_create_with_catalog(intoName,
+												tupdesc, RELKIND_RELATION);
 
 				FreeTupleDesc(tupdesc);
 

src/backend/executor/nodeTee.c

@@ -15,7 +15,7 @@
  *		ExecEndTee
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.19 1998/07/27 19:37:57 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.20 1998/08/06 05:12:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -168,7 +168,8 @@ ExecInitTee(Tee *node, EState *currentEstate, Plan *parent)
 			bufferRel = heap_openr(teeState->tee_bufferRelname);
 		else
 			bufferRel = heap_open(
-								  heap_create_with_catalog(teeState->tee_bufferRelname, tupType));
+				heap_create_with_catalog(teeState->tee_bufferRelname,
+										 tupType, RELKIND_RELATION));
 	}
 	else
 	{
@@ -177,7 +178,8 @@ ExecInitTee(Tee *node, EState *currentEstate, Plan *parent)
 				newoid());
 /*		bufferRel = ExecCreatR(len, tupType, _TEMP_RELATION_ID); */
 		bufferRel = heap_open(
-		 heap_create_with_catalog(teeState->tee_bufferRelname, tupType));
+			heap_create_with_catalog(teeState->tee_bufferRelname,
+									 tupType, RELKIND_RELATION));
 	}
 
 	teeState->tee_bufferRel = bufferRel;

src/backend/parser/parse.h

@@ -16,6 +16,7 @@ typedef union
 	DefElem				*defelt;
 	ParamString			*param;
 	SortGroupBy			*sortgroupby;
+	JoinUsing			*joinusing;
 	IndexElem			*ielem;
 	RangeVar			*range;
 	RelExpr				*relexp;

src/backend/storage/large_object/inv_api.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.32 1998/07/27 19:38:11 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.33 1998/08/06 05:12:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -153,7 +153,7 @@ inv_create(int flags)
 	 * be located on whatever storage manager the user requested.
 	 */
 
-	heap_create_with_catalog(objname, tupdesc);
+	heap_create_with_catalog(objname, tupdesc, RELKIND_LOBJECT);
 
 	/* make the relation visible in this transaction */
 	CommandCounterIncrement();

src/backend/tcop/utility.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.44 1998/07/26 04:30:48 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.45 1998/08/06 05:12:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -173,7 +173,7 @@ ProcessUtility(Node *parsetree,
 			*ps_status = commandTag = "CREATE";
 			CHECK_IF_ABORTED();
 
-			DefineRelation((CreateStmt *) parsetree);
+			DefineRelation((CreateStmt *) parsetree, RELKIND_RELATION);
 			break;
 
 		case T_DestroyStmt:

src/bin/pg_dump/pg_dump.c

@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.78 1998/07/19 05:24:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.79 1998/08/06 05:12:51 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -1418,7 +1418,7 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
 			"from pg_class, pg_user "
 			"where relowner = usesysid and "
 			"(relkind = 'r' or relkind = 'S') and relname !~ '^pg_' "
-			"and relname !~ '^xin[xv][0-9]+' order by oid");
+			"order by oid");
 
 	res = PQexec(g_conn, query);
 	if (!res ||
@@ -1879,7 +1879,7 @@ getIndices(int *numIndices)
 			"from pg_index i, pg_class t1, pg_class t2, pg_am a "
 			"where t1.oid = i.indexrelid and t2.oid = i.indrelid "
 			"and t1.relam = a.oid and i.indexrelid > '%d'::oid "
-			"and t2.relname !~ '^pg_' and t1.relname !~ '^xinx'",
+			"and t2.relname !~ '^pg_' and t1.relkind != 'l'",
 			g_last_builtin_oid);
 
 	res = PQexec(g_conn, query);

src/bin/psql/psql.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.151 1998/08/05 16:23:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.152 1998/08/06 05:12:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -408,7 +408,6 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,
 		strcat(listbuf, "  and relname !~ '^pg_'");
 	else
 		strcat(listbuf, "  and relname ~ '^pg_'");
-	strcat(listbuf, " and relname !~ '^xin[vx][0-9]+'");
 	strcat(listbuf, " and usesysid = relowner");
 	strcat(listbuf, " ORDER BY relname ");
 	if (!(res = PSQLexec(pset, listbuf)))
@@ -544,7 +543,6 @@ rightsList(PsqlSettings *pset)
 	strcat(listbuf, "FROM pg_class, pg_user ");
 	strcat(listbuf, "WHERE ( relkind = 'r' OR relkind = 'i' OR relkind = 'S') ");
 	strcat(listbuf, "  and relname !~ '^pg_'");
-	strcat(listbuf, "  and relname !~ '^xin[vx][0-9]+'");
 	strcat(listbuf, "  and usesysid = relowner");
 	strcat(listbuf, "  ORDER BY relname ");
 	if (!(res = PSQLexec(pset, listbuf)))

src/include/catalog/heap.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heap.h,v 1.12 1998/02/26 04:40:38 momjian Exp $
+ * $Id: heap.h,v 1.13 1998/08/06 05:13:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,8 @@
 
 extern Relation heap_create(char *relname, TupleDesc att);
 
-extern Oid	heap_create_with_catalog(char relname[], TupleDesc tupdesc);
+extern Oid	heap_create_with_catalog(char *relname,
+									 TupleDesc tupdesc, char relkind);
 
 extern void heap_destroy_with_catalog(char relname[]);
 extern void heap_destroy(Relation r);

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.20 1998/02/26 04:40:52 momjian Exp $
+ * $Id: pg_class.h,v 1.21 1998/08/06 05:13:05 momjian Exp $
  *
  * NOTES
  *	  ``pg_relation'' is being replaced by ``pg_class''.  currently
@@ -157,6 +157,7 @@ DESCR("");
 #define RelOid_pg_trigger		1219
 
 #define		  RELKIND_INDEX			  'i'		/* secondary index */
+#define		  RELKIND_LOBJECT		  'l'		/* large objects */
 #define		  RELKIND_RELATION		  'r'		/* cataloged heap */
 #define		  RELKIND_SPECIAL		  's'		/* special (non-heap) */
 #define		  RELKIND_SEQUENCE		  'S'		/* SEQUENCE relation */

src/include/catalog/pg_class_mb.h

@@ -7,172 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_class_mb.h,v 1.1 1998/07/27 03:21:58 scrappy Exp $
- *
- * NOTES
- *	  ``pg_relation'' is being replaced by ``pg_class''.  currently
- *	  we are only changing the name in the catalogs but someday the
- *	  code will be changed too. -cim 2/26/90
- *	  [it finally happens.	-ay 11/5/94]
- *
- *	  the genbki.sh script reads this file and generates .bki
- *	  information from the DATA() statements.
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_RELATION_H
-#define PG_RELATION_H
-
-/* ----------------
- *		postgres.h contains the system type definintions and the
- *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
- *		can be read by both genbki.sh and the C compiler.
- * ----------------
- */
-
-/* ----------------
- *		pg_class definition.  cpp turns this into
- *		typedef struct FormData_pg_class
- *
- *		Note: the #if 0, #endif around the BKI_BEGIN.. END block
- *			  below keeps cpp from seeing what is meant for the
- *			  genbki script: pg_relation is now called pg_class, but
- *			  only in the catalogs -cim 2/26/90
- * ----------------
- */
-
-/* ----------------
- *		This structure is actually variable-length (the last attribute is
- *		a POSTGRES array).	Hence, sizeof(FormData_pg_class) does not
- *		describe the fixed-length or actual size of the structure.
- *		FormData_pg_class.relacl may not be correctly aligned, either,
- *		if aclitem and struct varlena don't align together.  Hence,
- *		you MUST use heap_getattr() to get the relacl field.
- * ----------------
- */
-CATALOG(pg_class) BOOTSTRAP
-{
-	NameData	relname;
-	Oid			reltype;
-	Oid			relowner;
-	Oid			relam;
-	int4		relpages;
-	int4		reltuples;
-	bool		relhasindex;
-	bool		relisshared;
-	char		relkind;
-	int2		relnatts;
-
-	/*
-	 * relnatts is the number of user attributes this class has.  There
-	 * must be exactly this many instances in Class pg_attribute for this
-	 * class which have attnum > 0 (= user attribute).
-	 */
-	int2		relchecks;		/* # of CHECK constraints, not stored in
-								 * db? */
-	int2		reltriggers;	/* # of TRIGGERs */
-	bool		relhasrules;
-	aclitem		relacl[1];		/* this is here for the catalog */
-} FormData_pg_class;
-
-#define CLASS_TUPLE_SIZE \
-	 (offsetof(FormData_pg_class,relhasrules) + sizeof(bool))
-
-/* ----------------
- *		Form_pg_class corresponds to a pointer to a tuple with
- *		the format of pg_class relation.
- * ----------------
- */
-typedef FormData_pg_class *Form_pg_class;
-
-/* ----------------
- *		compiler constants for pg_class
- * ----------------
- */
-
-/* ----------------
- *		Natts_pg_class_fixed is used to tell routines that insert new
- *		pg_class tuples (as opposed to replacing old ones) that there's no
- *		relacl field.
- * ----------------
- */
-#define Natts_pg_class_fixed			13
-#define Natts_pg_class					14
-#define Anum_pg_class_relname			1
-#define Anum_pg_class_reltype			2
-#define Anum_pg_class_relowner			3
-#define Anum_pg_class_relam				4
-#define Anum_pg_class_relpages			5
-#define Anum_pg_class_reltuples			6
-#define Anum_pg_class_relhasindex		7
-#define Anum_pg_class_relisshared		8
-#define Anum_pg_class_relkind			9
-#define Anum_pg_class_relnatts			10
-#define Anum_pg_class_relchecks			11
-#define Anum_pg_class_reltriggers		12
-#define Anum_pg_class_relhasrules		13
-#define Anum_pg_class_relacl			14
-
-/* ----------------
- *		initial contents of pg_class
- * ----------------
- */
-
-DATA(insert OID = 1247 (  pg_type 71		  PGUID 0 0 0 f f r 16 0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1249 (  pg_attribute 75	  PGUID 0 0 0 f f r 14 0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1255 (  pg_proc 81		  PGUID 0 0 0 f f r 16 0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1259 (  pg_class 83		  PGUID 0 0 0 f f r 14 0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1260 (  pg_shadow 86		  PGUID 0 0 0 f t r 8  0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1261 (  pg_group 87		  PGUID 0 0 0 f t s 3  0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1262 (  pg_database 88	  PGUID 0 0 0 f t r 4  0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1264 (  pg_variable 90	  PGUID 0 0 0 f t s 2  0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1269 (  pg_log  99		  PGUID 0 0 0 f t s 1  0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1215 (  pg_attrdef 109	  PGUID 0 0 0 t t r 4  0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1216 (  pg_relcheck 110	  PGUID 0 0 0 t t r 4  0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1219 (  pg_trigger 111	  PGUID 0 0 0 t t r 7  0 0 f _null_ ));
-DESCR("");
-
-#define RelOid_pg_type			1247
-#define RelOid_pg_attribute		1249
-#define RelOid_pg_proc			1255
-#define RelOid_pg_class			1259
-#define RelOid_pg_shadow		1260
-#define RelOid_pg_group			1261
-#define RelOid_pg_database		1262
-#define RelOid_pg_variable		1264
-#define RelOid_pg_log			1269
-#define RelOid_pg_attrdef		1215
-#define RelOid_pg_relcheck		1216
-#define RelOid_pg_trigger		1219
-
-#define		  RELKIND_INDEX			  'i'		/* secondary index */
-#define		  RELKIND_RELATION		  'r'		/* cataloged heap */
-#define		  RELKIND_SPECIAL		  's'		/* special (non-heap) */
-#define		  RELKIND_SEQUENCE		  'S'		/* SEQUENCE relation */
-#define		  RELKIND_UNCATALOGED	  'u'		/* temporary heap */
-
-#endif							/* PG_RELATION_H */
-/*-------------------------------------------------------------------------
- *
- * pg_class.h--
- *	  definition of the system "relation" relation (pg_class)
- *	  along with the relation's initial contents.
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * $Id: pg_class_mb.h,v 1.1 1998/07/27 03:21:58 scrappy Exp $
+ * $Id: pg_class_mb.h,v 1.2 1998/08/06 05:13:07 momjian Exp $
  *
  * NOTES
  *	  ``pg_relation'' is being replaced by ``pg_class''.  currently

src/include/catalog/pg_database_mb.h

@@ -7,65 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_database_mb.h,v 1.1 1998/07/27 03:21:58 scrappy Exp $
- *
- * NOTES
- *	  the genbki.sh script reads this file and generates .bki
- *	  information from the DATA() statements.
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_DATABASE_H
-#define PG_DATABASE_H
-
-/* ----------------
- *		postgres.h contains the system type definintions and the
- *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
- *		can be read by both genbki.sh and the C compiler.
- * ----------------
- */
-
-/* ----------------
- *		pg_database definition.  cpp turns this into
- *		typedef struct FormData_pg_database
- * ----------------
- */
-CATALOG(pg_database) BOOTSTRAP
-{
-	NameData	datname;
-	int4		datdba;
-	int4		encoding;
-	text		datpath;		/* VARIABLE LENGTH FIELD */
-} FormData_pg_database;
-/* ----------------
- *		Form_pg_database corresponds to a pointer to a tuple with
- *		the format of pg_database relation.
- * ----------------
- */
-typedef FormData_pg_database *Form_pg_database;
-
-/* ----------------
- *		compiler constants for pg_database
- * ----------------
- */
-#define Natts_pg_database				4
-#define Anum_pg_database_datname		1
-#define Anum_pg_database_datdba			2
-#define Anum_pg_database_encoding		3
-#define Anum_pg_database_datpath		4
-
-
-#endif							/* PG_DATABASE_H */
-/*-------------------------------------------------------------------------
- *
- * pg_database.h--
- *	  definition of the system "database" relation (pg_database)
- *	  along with the relation's initial contents.
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * $Id: pg_database_mb.h,v 1.1 1998/07/27 03:21:58 scrappy Exp $
+ * $Id: pg_database_mb.h,v 1.2 1998/08/06 05:13:09 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki

src/include/commands/creatinh.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: creatinh.h,v 1.6 1997/11/26 01:12:12 momjian Exp $
+ * $Id: creatinh.h,v 1.7 1998/08/06 05:13:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,7 @@
 
 #include "nodes/parsenodes.h"
 
-extern void DefineRelation(CreateStmt *stmt);
+extern void DefineRelation(CreateStmt *stmt, char relkind);
 extern void RemoveRelation(char *name);
 
 #endif							/* CREATINH_H */

src/tools/backend/flow.fig

@@ -92,12 +92,12 @@ Inches
 	0 0 2.00 150.00 180.00
 	0 0 2.00 150.00 180.00
 	 4660 1524 5295 1293
-2 1 0 2 31 7 0 0 -1 0.000 0 0 -1 1 0 2
-	0 0 2.00 150.00 180.00
-	 2550 3300 2550 4275
 2 1 0 2 8 7 0 0 -1 0.000 0 0 -1 1 0 2
 	0 0 2.00 150.00 180.00
 	 2550 7275 2550 7875
+2 1 0 2 31 7 0 0 -1 0.000 0 0 -1 1 0 2
+	0 0 2.00 150.00 180.00
+	 2550 3300 2550 4275
 3 0 0 2 8 7 0 0 -1 0.000 0 1 0 8
 	0 0 2.00 150.00 150.00
 	 1350 9375 1050 9375 825 9000 825 4425 1050 4050 1500 3975
@@ -106,25 +106,25 @@ Inches
 	0 0 2.00 150.00 150.00
 	 7650 5775 8250 5475 8250 4575 7725 3975 3525 3975 2850 3975
 	 2700 4275
-4 1 -1 0 0 28 18 0.0000 4 195 1050 1560 11190 Utilities\001
-4 1 -1 0 0 28 18 0.0000 4 240 2325 7965 11190 Storage Managers\001
-4 1 -1 0 0 0 18 0.0000 4 255 840 4725 11175 Catalog\001
-4 1 -1 0 0 28 18 0.0000 4 195 2100 3135 12405 Access Methods\001
-4 1 7 0 0 28 18 0.0000 4 195 1980 2535 7230 Generate Paths\001
-4 1 7 0 0 28 18 0.0000 4 195 1485 6450 6030 Commands\001
-4 1 7 0 0 28 18 0.0000 4 195 1830 2565 8445 Generate Plan\001
-4 1 -1 0 0 28 18 0.0000 4 195 1470 2535 1965 Postmaster\001
-4 1 -1 0 0 28 18 0.0000 4 240 1110 6435 3150 Postgres\001
-4 1 -1 0 0 28 18 0.0000 4 240 1110 2550 3165 Postgres\001
-4 1 7 0 0 28 18 0.0000 4 195 1275 2565 6945 Rewrite &\001
-4 1 7 0 0 28 18 0.0000 4 255 1500 2565 5865 Traffic Cop\001
-4 1 7 0 0 28 18 0.0000 4 195 825 2535 4650 Parser\001
-4 1 7 0 0 28 18 0.0000 4 195 1890 2550 8175 Choose Path &\001
-4 1 7 0 0 28 18 0.0000 4 195 1140 2535 9495 Executor\001
+4 1 -1 0 0 16 18 0.0000 4 210 900 1560 11190 Utilities\001
+4 1 -1 0 0 16 18 0.0000 4 270 2265 7965 11190 Storage Managers\001
+4 1 -1 0 0 16 18 0.0000 4 270 960 4725 11175 Catalog\001
+4 1 -1 0 0 16 18 0.0000 4 210 2070 3135 12405 Access Methods\001
+4 1 7 0 0 16 18 0.0000 4 210 1380 6450 6030 Commands\001
+4 1 7 0 0 16 18 0.0000 4 210 1725 2565 8445 Generate Plan\001
+4 1 -1 0 0 16 18 0.0000 4 270 1110 6435 3150 Postgres\001
+4 1 -1 0 0 16 18 0.0000 4 270 1110 2550 3165 Postgres\001
+4 1 7 0 0 16 18 0.0000 4 210 1200 2565 6945 Rewrite &\001
+4 1 7 0 0 16 18 0.0000 4 270 1410 2565 5865 Traffic Cop\001
+4 1 7 0 0 16 18 0.0000 4 210 780 2535 4650 Parser\001
+4 1 7 0 0 16 18 0.0000 4 210 1110 2535 9495 Executor\001
 4 1 8 0 0 28 18 0.0000 4 240 795 4455 5700 utility\001
-4 1 7 0 0 28 18 0.0000 4 240 825 6450 5745 Utility\001
-4 1 -1 0 0 28 18 0.0000 4 195 630 2520 765 Main\001
+4 1 7 0 0 16 18 0.0000 4 270 705 6450 5745 Utility\001
+4 1 -1 0 0 16 18 0.0000 4 210 585 2520 765 Main\001
 4 1 8 0 0 28 18 0.0000 4 240 1125 2565 6435 complex\001
-4 1 -1 0 0 0 18 0.0000 4 225 1425 6450 12375 Nodes / Lists\001
-4 1 7 0 0 0 18 0.0000 4 255 645 6450 1350 Libpq\001
-4 1 -1 0 0 0 18 0.0000 4 255 1095 1650 13650 Bootstrap\001
+4 1 -1 0 0 16 18 0.0000 4 210 1605 6450 12375 Nodes / Lists\001
+4 1 7 0 0 16 18 0.0000 4 270 705 6450 1350 Libpq\001
+4 1 7 0 0 16 18 0.0000 4 210 1890 2535 7230 Generate Paths\001
+4 1 7 0 0 16 18 0.0000 4 210 1875 2550 8175 Choose Path &\001
+4 1 -1 0 0 16 18 0.0000 4 270 1230 1650 13650 Bootstrap\001
+4 1 -1 0 0 16 18 0.0000 4 210 1380 2535 1965 Postmaster\001