summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorBruce Momjian1997-12-27 06:41:41 +0000
committerBruce Momjian1997-12-27 06:41:41 +0000
commit4ce24c8aa98b26f0b070464ce118ef2a1901064e (patch)
tree15deb75908b3d87a498e01d46adc371088702e25 /src/include
parent2730c4a45c0f2e0c47caba19d2fe52dedfc3a928 (diff)
UNION work for UNION ALL and other union stuff.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/nodes/parsenodes.h7
-rw-r--r--src/include/nodes/plannodes.h3
2 files changed, 6 insertions, 4 deletions
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index a6b9a400ea5..d288d66aa36 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: parsenodes.h,v 1.39 1997/12/24 06:06:53 momjian Exp $
+ * $Id: parsenodes.h,v 1.40 1997/12/27 06:41:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,7 +43,8 @@ typedef struct Query
char *into; /* portal (cursor) name */
bool isPortal; /* is this a retrieve into portal? */
bool isBinary; /* binary portal? */
-
+ bool unionall; /* union without unique sort */
+
char *uniqueFlag; /* NULL, '*', or Unique attribute name */
List *sortClause; /* a list of SortClause's */
@@ -636,7 +637,7 @@ typedef struct RetrieveStmt
Node *havingClause; /* having conditional-expression */
List *unionClause; /* union subselect parameters */
List *sortClause; /* sort clause (a list of SortGroupBy's) */
- int unionall; /* union without unique sort */
+ bool unionall; /* union without unique sort */
} RetrieveStmt;
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 63447c93692..2dc464c2a7a 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: plannodes.h,v 1.11 1997/12/18 12:54:37 momjian Exp $
+ * $Id: plannodes.h,v 1.12 1997/12/27 06:41:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -119,6 +119,7 @@ typedef struct Append
{
Plan plan;
List *unionplans;
+ List *unionrts;
Index unionrelid;
List *unionrtentries;
AppendState *unionstate;