Array mega-patch.

Joe Conway

4 files changed, 30 insertions, 4 deletions

diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 12b82fc5bcb..b5e5b112725 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.252 2003/06/06 15:04:02 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.253 2003/06/24 23:14:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -728,6 +728,7 @@ _copyAggref(Aggref *from)
 	COPY_SCALAR_FIELD(agglevelsup);
 	COPY_SCALAR_FIELD(aggstar);
 	COPY_SCALAR_FIELD(aggdistinct);
+	COPY_NODE_FIELD(args);
 
 	return newnode;
 }
@@ -826,6 +827,7 @@ _copySubLink(SubLink *from)
 
 	COPY_SCALAR_FIELD(subLinkType);
 	COPY_SCALAR_FIELD(useOr);
+	COPY_SCALAR_FIELD(isExpr);
 	COPY_NODE_FIELD(lefthand);
 	COPY_NODE_FIELD(operName);
 	COPY_OIDLIST_FIELD(operOids);
@@ -844,6 +846,12 @@ _copySubPlan(SubPlan *from)
 
 	COPY_SCALAR_FIELD(subLinkType);
 	COPY_SCALAR_FIELD(useOr);
+	COPY_SCALAR_FIELD(isExpr);
+	COPY_SCALAR_FIELD(exprtype);
+	COPY_SCALAR_FIELD(elemtype);
+	COPY_SCALAR_FIELD(elmlen);
+	COPY_SCALAR_FIELD(elmbyval);
+	COPY_SCALAR_FIELD(elmalign);
 	COPY_NODE_FIELD(exprs);
 	COPY_INTLIST_FIELD(paramIds);
 	COPY_NODE_FIELD(plan);
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 40211231c6f..23c1018968d 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -18,7 +18,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.195 2003/06/06 15:04:02 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.196 2003/06/24 23:14:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -205,6 +205,7 @@ _equalAggref(Aggref *a, Aggref *b)
 	COMPARE_SCALAR_FIELD(agglevelsup);
 	COMPARE_SCALAR_FIELD(aggstar);
 	COMPARE_SCALAR_FIELD(aggdistinct);
+	COMPARE_NODE_FIELD(args);
 
 	return true;
 }
@@ -301,6 +302,7 @@ _equalSubLink(SubLink *a, SubLink *b)
 {
 	COMPARE_SCALAR_FIELD(subLinkType);
 	COMPARE_SCALAR_FIELD(useOr);
+	COMPARE_SCALAR_FIELD(isExpr);
 	COMPARE_NODE_FIELD(lefthand);
 	COMPARE_NODE_FIELD(operName);
 	COMPARE_OIDLIST_FIELD(operOids);
@@ -314,6 +316,12 @@ _equalSubPlan(SubPlan *a, SubPlan *b)
 {
 	COMPARE_SCALAR_FIELD(subLinkType);
 	COMPARE_SCALAR_FIELD(useOr);
+	COMPARE_SCALAR_FIELD(isExpr);
+	COMPARE_SCALAR_FIELD(exprtype);
+	COMPARE_SCALAR_FIELD(elemtype);
+	COMPARE_SCALAR_FIELD(elmlen);
+	COMPARE_SCALAR_FIELD(elmbyval);
+	COMPARE_SCALAR_FIELD(elmalign);
 	COMPARE_NODE_FIELD(exprs);
 	COMPARE_INTLIST_FIELD(paramIds);
 	/* should compare plans, but have to settle for comparing plan IDs */
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index f042e8a8d21..cbd5784f563 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.208 2003/06/15 22:51:45 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.209 2003/06/24 23:14:43 momjian Exp $
  *
  * NOTES
  *	  Every node type that can appear in stored rules' parsetrees *must*
@@ -616,6 +616,7 @@ _outAggref(StringInfo str, Aggref *node)
 	WRITE_UINT_FIELD(agglevelsup);
 	WRITE_BOOL_FIELD(aggstar);
 	WRITE_BOOL_FIELD(aggdistinct);
+	WRITE_NODE_FIELD(args);
 }
 
 static void
@@ -701,6 +702,7 @@ _outSubLink(StringInfo str, SubLink *node)
 
 	WRITE_ENUM_FIELD(subLinkType, SubLinkType);
 	WRITE_BOOL_FIELD(useOr);
+	WRITE_BOOL_FIELD(isExpr);
 	WRITE_NODE_FIELD(lefthand);
 	WRITE_NODE_FIELD(operName);
 	WRITE_OIDLIST_FIELD(operOids);
@@ -714,6 +716,12 @@ _outSubPlan(StringInfo str, SubPlan *node)
 
 	WRITE_ENUM_FIELD(subLinkType, SubLinkType);
 	WRITE_BOOL_FIELD(useOr);
+	WRITE_BOOL_FIELD(isExpr);
+	WRITE_OID_FIELD(exprtype);
+	WRITE_OID_FIELD(elemtype);
+	WRITE_INT_FIELD(elmlen);
+	WRITE_BOOL_FIELD(elmbyval);
+	WRITE_CHAR_FIELD(elmalign);
 	WRITE_NODE_FIELD(exprs);
 	WRITE_INTLIST_FIELD(paramIds);
 	WRITE_NODE_FIELD(plan);
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 7d3a1506a81..a661f9e8ad1 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.154 2003/06/06 15:04:02 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.155 2003/06/24 23:14:43 momjian Exp $
  *
  * NOTES
  *	  Path and Plan nodes do not have any readfuncs support, because we
@@ -416,6 +416,7 @@ _readAggref(void)
 	READ_UINT_FIELD(agglevelsup);
 	READ_BOOL_FIELD(aggstar);
 	READ_BOOL_FIELD(aggdistinct);
+	READ_NODE_FIELD(args);
 
 	READ_DONE();
 }
@@ -545,6 +546,7 @@ _readSubLink(void)
 
 	READ_ENUM_FIELD(subLinkType, SubLinkType);
 	READ_BOOL_FIELD(useOr);
+	READ_BOOL_FIELD(isExpr);
 	READ_NODE_FIELD(lefthand);
 	READ_NODE_FIELD(operName);
 	READ_OIDLIST_FIELD(operOids);