Ooops, didn't cut-and-paste quite enough code from ResolveNew;

tglsfdc · tglsfdc · commit 136828c699ed · 2003-01-16T18:26:02.000Z
with result that flatten_join_alias_vars failed to descend into subselects.
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.44 2003/01/15 19:35:44 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.45 2003/01/16 18:26:02 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -360,6 +360,23 @@ flatten_join_alias_vars_mutator(Node *node,
 		/* expand it; recurse in case join input is itself a join */
 		return flatten_join_alias_vars_mutator(newvar, context);
 	}
+
+	/*
+	 * Since expression_tree_mutator won't touch subselects, we have to
+	 * handle them specially.
+	 */
+	if (IsA(node, SubLink))
+	{
+		SubLink    *sublink = (SubLink *) node;
+		SubLink    *newnode;
+
+		FLATCOPY(newnode, sublink, SubLink);
+		MUTATE(newnode->lefthand, sublink->lefthand, List *,
+			   flatten_join_alias_vars_mutator, context);
+		MUTATE(newnode->subselect, sublink->subselect, Node *,
+			   flatten_join_alias_vars_mutator, context);
+		return (Node *) newnode;
+	}
 	if (IsA(node, Query))
 	{
 		/* Recurse into RTE subquery or not-yet-planned sublink subquery */
@@ -375,6 +392,7 @@ flatten_join_alias_vars_mutator(Node *node,
 	}
 	/* Already-planned tree not supported */
 	Assert(!is_subplan(node));
+
 	return expression_tree_mutator(node, flatten_join_alias_vars_mutator,
 								   (void *) context);
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.44 2003/01/15 19:35:44 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.45 2003/01/16 18:26:02 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -360,6 +360,23 @@ flatten_join_alias_vars_mutator(Node *node,`
`360`	`360`	`/* expand it; recurse in case join input is itself a join */`
`361`	`361`	`return flatten_join_alias_vars_mutator(newvar, context);`
`362`	`362`	`}`
	`363`	`+`
	`364`	`+ /*`
	`365`	`+ * Since expression_tree_mutator won't touch subselects, we have to`
	`366`	`+ * handle them specially.`
	`367`	`+ */`
	`368`	`+ if (IsA(node, SubLink))`
	`369`	`+ {`
	`370`	`+ SubLink sublink = (SubLink ) node;`
	`371`	`+ SubLink *newnode;`
	`372`	`+`
	`373`	`+ FLATCOPY(newnode, sublink, SubLink);`
	`374`	`+ MUTATE(newnode->lefthand, sublink->lefthand, List *,`
	`375`	`+ flatten_join_alias_vars_mutator, context);`
	`376`	`+ MUTATE(newnode->subselect, sublink->subselect, Node *,`
	`377`	`+ flatten_join_alias_vars_mutator, context);`
	`378`	`+ return (Node *) newnode;`
	`379`	`+ }`
`363`	`380`	`if (IsA(node, Query))`
`364`	`381`	`{`
`365`	`382`	`/* Recurse into RTE subquery or not-yet-planned sublink subquery */`
`@@ -375,6 +392,7 @@ flatten_join_alias_vars_mutator(Node *node,`
`375`	`392`	`}`
`376`	`393`	`/* Already-planned tree not supported */`
`377`	`394`	`Assert(!is_subplan(node));`
	`395`	`+`
`378`	`396`	`return expression_tree_mutator(node, flatten_join_alias_vars_mutator,`
`379`	`397`	`(void *) context);`
`380`	`398`	`}`