Add defenses against trying to attach qual conditions to a setOperation

query node, since that won't work unless the planner is upgraded.
Someday we should try to support at least some cases of this, but for
now just plug the hole in the dike.  Per discussion with Dmitry Tkach.

1 files changed, 21 insertions, 1 deletions

diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 0d3dbe7d6e6..1cd42a44f76 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.72 2003/06/06 15:04:02 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.73 2003/07/16 17:25:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -733,6 +733,16 @@ AddQual(Query *parsetree, Node *qual)
 			elog(ERROR, "Conditional utility statements are not implemented");
 	}
 
+	if (parsetree->setOperations != NULL)
+	{
+		/*
+		 * There's noplace to put the qual on a setop statement, either.
+		 * (This could be fixed, but right now the planner simply ignores
+		 * any qual condition on a setop query.)
+		 */
+		elog(ERROR, "Conditional UNION/INTERSECT/EXCEPT statements are not implemented");
+	}
+
 	/* INTERSECT want's the original, but we need to copy - Jan */
 	copy = copyObject(qual);
 
@@ -773,6 +783,16 @@ AddHavingQual(Query *parsetree, Node *havingQual)
 			elog(ERROR, "Conditional utility statements are not implemented");
 	}
 
+	if (parsetree->setOperations != NULL)
+	{
+		/*
+		 * There's noplace to put the qual on a setop statement, either.
+		 * (This could be fixed, but right now the planner simply ignores
+		 * any qual condition on a setop query.)
+		 */
+		elog(ERROR, "Conditional UNION/INTERSECT/EXCEPT statements are not implemented");
+	}
+
 	/* INTERSECT want's the original, but we need to copy - Jan */
 	copy = copyObject(havingQual);