Back out ALTER DOMAIN patch until missing file appears.

4 files changed, 13 insertions, 45 deletions

diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 8804e5fe602..c702270fbef 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.135 2002/12/06 03:28:33 momjian Exp $
+ * $Id: pg_type.h,v 1.136 2002/12/06 03:43:18 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -550,7 +550,7 @@ extern Oid TypeCreate(const char *typeName,
 		   Oid elementType,
 		   Oid baseType,
 		   const char *defaultTypeValue,
-		   char *defaultTypeBin,
+		   const char *defaultTypeBin,
 		   bool passedByValue,
 		   char alignment,
 		   char storage,
@@ -558,18 +558,6 @@ extern Oid TypeCreate(const char *typeName,
 		   int32 typNDims,
 		   bool typeNotNull);
 
-extern void
-GenerateTypeDependencies(Oid typeNamespace,
-						 Oid typeObjectId,
-						 Oid relationOid,		/* only for 'c'atalog typeType */
-						 char relationKind,
-						 Oid inputProcedure,
-						 Oid outputProcedure,
-						 Oid elementType,
-						 Oid baseType,
-						 char *defaultTypeBin,	/* cooked rep */
-						 bool rebuild);
-
 
 extern void TypeRename(const char *oldTypeName, Oid typeNamespace,
 		   const char *newTypeName);
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index d098277e798..9f9dd63ab42 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: defrem.h,v 1.47 2002/12/06 03:28:33 momjian Exp $
+ * $Id: defrem.h,v 1.48 2002/12/06 03:43:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,6 +52,14 @@ extern void RemoveOperatorById(Oid operOid);
 extern void DefineAggregate(List *names, List *parameters);
 extern void RemoveAggregate(RemoveAggrStmt *stmt);
 
+/* commands/typecmds.c */
+extern void DefineType(List *names, List *parameters);
+extern void RemoveType(List *names, DropBehavior behavior);
+extern void RemoveTypeById(Oid typeOid);
+extern void DefineDomain(CreateDomainStmt *stmt);
+extern void RemoveDomain(List *names, DropBehavior behavior);
+extern Oid	DefineCompositeType(const RangeVar *typevar, List *coldeflist);
+
 /* commands/opclasscmds.c */
 extern void DefineOpClass(CreateOpClassStmt *stmt);
 extern void RemoveOpClass(RemoveOpClassStmt *stmt);
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index dc1290775d9..895a77cbf4d 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.127 2002/12/06 03:28:33 momjian Exp $
+ * $Id: nodes.h,v 1.128 2002/12/06 03:43:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -157,7 +157,6 @@ typedef enum NodeTag
 	T_UpdateStmt,
 	T_SelectStmt,
 	T_AlterTableStmt,
-	T_AlterDomainStmt,
 	T_SetOperationStmt,
 	T_GrantStmt,
 	T_ClosePortalStmt,
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index adcb6d9a551..38fe9fe3db0 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsenodes.h,v 1.219 2002/12/06 03:28:33 momjian Exp $
+ * $Id: parsenodes.h,v 1.220 2002/12/06 03:43:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -828,33 +828,6 @@ typedef struct AlterTableStmt
 } AlterTableStmt;
 
 /* ----------------------
- *	Alter Domain
- *
- * The fields are used in different ways by the different variants of
- * this command. Subtypes should match AlterTable subtypes
- * ----------------------
- */
-typedef struct AlterDomainStmt
-{
-	NodeTag		type;
-	char		subtype;		/*------------
-								 *	T = alter column default
-								 *	N = alter column drop not null
-								 *	O = alter column set not null
-								 *	C = add constraint
-								 *	X = drop constraint
-								 *	U = change owner
-								 *------------
-								 */
-	List	   *typename;		/* table to work on */
-	char	   *name;			/* column or constraint name to act on, or
-								 * new owner */
-	Node	   *def;			/* definition of default or constraint */
-	DropBehavior behavior;		/* RESTRICT or CASCADE for DROP cases */
-} AlterDomainStmt;
-
-
-/* ----------------------
  *		Grant|Revoke Statement
  * ----------------------
  */