Dump DEFAULT, CHECK, Triggers.

Fix BASETYPE for aggregates with sfunc2 only.

src/bin/pg_dump/common.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.16 1997/09/08 21:49:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.17 1997/10/02 13:57:03 vadim Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -262,7 +262,7 @@ dumpSchema(FILE *fout,
 	if (g_verbose)
 		fprintf(stderr, "%s reading user-defined tables %s\n",
 				g_comment_start, g_comment_end);
-	tblinfo = getTables(&numTables);
+	tblinfo = getTables(&numTables, finfo, numFuncs);
 
 	if (g_verbose)
 		fprintf(stderr, "%s reading table inheritance information %s\n",
@@ -336,7 +336,7 @@ dumpSchema(FILE *fout,
  */
 
 extern void
-dumpSchemaIdx(FILE *fout, int *numTablesPtr, const char *tablename,
+dumpSchemaIdx(FILE *fout, const char *tablename,
 			  TableInfo *tblinfo, int numTables)
 {
 	int			numIndices;

src/bin/pg_dump/pg_dump.h

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_dump.h,v 1.24 1997/09/24 15:36:36 momjian Exp $
+ * $Id: pg_dump.h,v 1.25 1997/10/02 13:57:07 vadim Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -76,6 +76,7 @@ typedef struct _tableInfo
 	char	  **attnames;		/* the attribute names */
 	char	  **typnames;		/* fill out attributes */
 	bool	   *notnull;		/* Not null constraints of an attribute */
+	char	  **adef_expr;		/* DEFAULT expressions */
 	int			numParents;		/* number of (immediate) parent
 								 * supertables */
 	char	  **parentRels;		/* names of parent relations, NULL if
@@ -88,7 +89,10 @@ typedef struct _tableInfo
 								 * the POSTQUEL tables */
 	int		   *attlen;			/* attribute lengths */
 	char	   *usename;
-
+	int			ncheck;			/* # of CHECK expressions */
+	char	  **check_expr;		/* [CONSTRAINT name] CHECK expressions */
+	int			ntrig;			/* # of triggers */
+	char	  **triggers;		/* CREATE TRIGGER ... */
 } TableInfo;
 
 typedef struct _inhInfo
@@ -176,7 +180,6 @@ dumpSchema(FILE *fout,
 		   const bool acls);
 extern void
 dumpSchemaIdx(FILE *fout,
-			  int *numTablesPtr,
 			  const char *tablename,
 			  TableInfo *tblinfo,
 			  int numTables);
@@ -205,7 +208,7 @@ extern void clearOprInfo(OprInfo *, int);
 extern void clearTypeInfo(TypeInfo *, int);
 
 extern OprInfo *getOperators(int *numOperators);
-extern TableInfo *getTables(int *numTables);
+extern TableInfo *getTables(int *numTables, FuncInfo *finfo, int numFuncs);
 extern InhInfo *getInherits(int *numInherits);
 extern void getTableAttrs(TableInfo *tbinfo, int numTables);
 extern IndInfo *getIndices(int *numIndices);