Fix for select 1=1 or 2=2, select 1=1 and 2=2, and select sum(2+2).

src/backend/optimizer/plan/planmain.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.12 1997/12/20 07:59:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.13 1997/12/22 05:42:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,7 +69,7 @@ query_planner(Query *root,
 			  List *qual)
 {
 	List	   *constant_qual = NIL;
-	List	   *flattened_tlist = NIL;
+	List	   *var_only_tlist = NIL;
 	List	   *level_tlist = NIL;
 	Plan	   *subplan = (Plan *) NULL;
 
@@ -109,16 +109,12 @@ query_planner(Query *root,
 	 * Create a target list that consists solely of (resdom var) target
 	 * list entries, i.e., contains no arbitrary expressions.
 	 */
-	flattened_tlist = flatten_tlist(tlist);
-	if (flattened_tlist)
-	{
-		level_tlist = flattened_tlist;
-	}
+	var_only_tlist = flatten_tlist(tlist);
+	if (var_only_tlist)
+		level_tlist = var_only_tlist;
 	else
-	{
 		/* from old code. the logic is beyond me. - ay 2/95 */
 		level_tlist = tlist;
-	}
 
 	/*
 	 * A query may have a non-variable target list and a non-variable
@@ -126,7 +122,7 @@ query_planner(Query *root,
 	 * all-new tuples, or - the query is a replace (a scan must still be
 	 * done in this case).
 	 */
-	if (flattened_tlist == NULL && qual == NULL)
+	if (var_only_tlist == NULL && qual == NULL)
 	{
 
 		switch (command_type)
@@ -192,11 +188,30 @@ query_planner(Query *root,
 		return (plan);
 	}
 
+	/*
+	 * fix up the flattened target list of the plan root node so that
+	 * expressions are evaluated.  this forces expression evaluations that
+	 * may involve expensive function calls to be delayed to the very last
+	 * stage of query execution.  this could be bad. but it is joey's
+	 * responsibility to optimally push these expressions down the plan
+	 * tree.  -- Wei
+	 *
+	 * But now nothing to do if there are GroupBy and/or Aggregates: 1.
+	 * make_groupPlan fixes tlist; 2. flatten_tlist_vars does nothing with
+	 * aggregates fixing only other entries (i.e. - GroupBy-ed and so
+	 * fixed by make_groupPlan).	 - vadim 04/05/97
+	 */
+	if (root->groupClause == NULL && root->qry_aggs == NULL)
+	{
+		subplan->targetlist = flatten_tlist_vars(tlist,
+												 subplan->targetlist);
+	}
+
+#ifdef NOT_USED
 	/*
 	 * Destructively modify the query plan's targetlist to add fjoin lists
 	 * to flatten functions that return sets of base types
 	 */
-#ifdef NOT_USED
 	subplan->targetlist = generate_fjoin(subplan->targetlist);
 #endif
 

src/backend/optimizer/plan/planner.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.14 1997/12/20 07:59:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.15 1997/12/22 05:42:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,7 +74,6 @@ planner(Query *parse)
 	List	   *rangetable = parse->rtable;
 	char	   *uniqueflag = parse->uniqueFlag;
 	List	   *sortclause = parse->sortClause;
-	Agg		   *aggplan = NULL;
 
 	Plan	   *result_plan = (Plan *) NULL;
 
@@ -141,7 +140,7 @@ planner(Query *parse)
 	 */
 	if (parse->qry_aggs)
 	{
-		aggplan = make_agg(tlist,
+		result_plan = (Plan *)make_agg(tlist,
 							parse->qry_numAgg,
 							parse->qry_aggs,
 							result_plan);
@@ -153,29 +152,8 @@ planner(Query *parse)
 		 * pointers, after a few dozen's of copying, they're not the same
 		 * as those in the target list.)
 		 */
-		set_agg_tlist_references(aggplan);
-		set_agg_agglist_references(aggplan);
-
-		result_plan = (Plan *) aggplan;
-	}
-
-	/*
-	 * fix up the flattened target list of the plan root node so that
-	 * expressions are evaluated.  this forces expression evaluations that
-	 * may involve expensive function calls to be delayed to the very last
-	 * stage of query execution.  this could be bad. but it is joey's
-	 * responsibility to optimally push these expressions down the plan
-	 * tree.  -- Wei
-	 *
-	 * But now nothing to do if there are GroupBy and/or Aggregates: 1.
-	 * make_groupPlan fixes tlist; 2. flatten_tlist_vars does nothing with
-	 * aggregates fixing only other entries (i.e. - GroupBy-ed and so
-	 * fixed by make_groupPlan).	 - vadim 04/05/97
-	 */
-	if (parse->groupClause == NULL && aggplan == NULL)
-	{
-		result_plan->targetlist = flatten_tlist_vars(tlist,
-												 result_plan->targetlist);
+		set_agg_tlist_references((Agg *)result_plan);
+		set_agg_agglist_references((Agg *)result_plan);
 	}
 
 	/*

src/backend/optimizer/plan/setrefs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.9 1997/12/20 07:59:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.10 1997/12/22 05:42:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -329,6 +329,15 @@ replace_clause_joinvar_refs(Expr *clause,
 	{
 		return ((List *) clause);
 	}
+	else if (and_clause((Node *) clause))
+	{
+		List	   *andclause =
+		replace_subclause_joinvar_refs(((Expr *) clause)->args,
+									   outer_tlist,
+									   inner_tlist);
+
+		return ((List *) make_andclause(andclause));
+	}
 	else if (or_clause((Node *) clause))
 	{
 		List	   *orclause =