3 files changed, 17 insertions, 12 deletions
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 2592270c258..6e678b26b33 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.143 2003/06/29 00:33:44 tgl Exp $
+ * $Id: nodes.h,v 1.144 2003/07/03 16:34:25 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -120,6 +120,7 @@ typedef enum NodeTag
 	T_BooleanTest,
 	T_CoerceToDomain,
 	T_CoerceToDomainValue,
+	T_SetToDefault,
 	T_TargetEntry,
 	T_RangeTblRef,
 	T_JoinExpr,
@@ -279,7 +280,6 @@ typedef enum NodeTag
 	T_PrivGrantee,
 	T_FuncWithArgs,
 	T_PrivTarget,
-	T_SetToDefault,
 	T_CreateOpClassItem,
 	T_CompositeTypeStmt,
 	T_InhRelation,
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 9101ba1e177..5cfe5ec645d 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.242 2003/06/29 00:33:44 tgl Exp $
+ * $Id: parsenodes.h,v 1.243 2003/07/03 16:34:25 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -279,14 +279,6 @@ typedef struct ResTarget
 } ResTarget;
 
 /*
- * Empty node used as a marker for Default Columns
- */
-typedef struct SetToDefault
-{
-	NodeTag		type;
-} SetToDefault;
-
-/*
  * SortGroupBy - for ORDER BY clause
  */
 typedef struct SortGroupBy
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 57827ee76fe..522ddc5f902 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: primnodes.h,v 1.86 2003/06/29 00:33:44 tgl Exp $
+ * $Id: primnodes.h,v 1.87 2003/07/03 16:34:26 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -674,6 +674,19 @@ typedef struct CoerceToDomainValue
 	int32		typeMod;		/* typemod for substituted value */
 } CoerceToDomainValue;
 
+/*
+ * Placeholder node for a DEFAULT marker in an INSERT or UPDATE command.
+ *
+ * This is not an executable expression: it must be replaced by the actual
+ * column default expression during rewriting.  But it is convenient to
+ * treat it as an expression node during parsing and rewriting.
+ */
+typedef struct SetToDefault
+{
+	Expr		xpr;
+	Oid			typeId;			/* type for substituted value */
+	int32		typeMod;		/* typemod for substituted value */
+} SetToDefault;
 
 /*
  * TargetEntry -