From 3a94e789f5c9537d804210be3cb26f7fb08e3b9e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 29 Sep 2000 18:21:41 +0000 Subject: Subselects in FROM clause, per ISO syntax: FROM (SELECT ...) [AS] alias. (Don't forget that an alias is required.) Views reimplemented as expanding to subselect-in-FROM. Grouping, aggregates, DISTINCT in views actually work now (he says optimistically). No UNION support in subselects/views yet, but I have some ideas about that. Rule-related permissions checking moved out of rewriter and into executor. INITDB REQUIRED! --- src/backend/commands/explain.c | 131 +++++++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 58 deletions(-) (limited to 'src/backend/commands/explain.c') diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 2b3d8b85726..25b7517e1ec 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994-5, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.58 2000/09/12 21:06:47 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.59 2000/09/29 18:21:26 tgl Exp $ * */ @@ -176,6 +176,12 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es) case T_IndexScan: pname = "Index Scan"; break; + case T_TidScan: + pname = "Tid Scan"; + break; + case T_SubqueryScan: + pname = "Subquery Scan"; + break; case T_Material: pname = "Materialize"; break; @@ -194,9 +200,6 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es) case T_Hash: pname = "Hash"; break; - case T_TidScan: - pname = "Tid Scan"; - break; default: pname = "???"; break; @@ -225,37 +228,27 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es) case T_TidScan: if (((Scan *) plan)->scanrelid > 0) { - RangeTblEntry *rte = nth(((Scan *) plan)->scanrelid - 1, es->rtable); + RangeTblEntry *rte = rt_fetch(((Scan *) plan)->scanrelid, + es->rtable); + + /* Assume it's on a real relation */ + Assert(rte->relname); appendStringInfo(str, " on %s", stringStringInfo(rte->relname)); - if (rte->alias != NULL) - { - if ((strcmp(rte->alias->relname, rte->relname) != 0) - || (length(rte->alias->attrs) > 0)) - { - appendStringInfo(str, " %s", - stringStringInfo(rte->alias->relname)); - - if (length(rte->alias->attrs) > 0) - { - List *c; - int firstEntry = true; - - appendStringInfo(str, " ("); - foreach(c, rte->alias->attrs) - { - if (!firstEntry) - { - appendStringInfo(str, ", "); - firstEntry = false; - } - appendStringInfo(str, "%s", strVal(lfirst(c))); - } - appendStringInfo(str, ")"); - } - } - } + if (strcmp(rte->eref->relname, rte->relname) != 0) + appendStringInfo(str, " %s", + stringStringInfo(rte->eref->relname)); + } + break; + case T_SubqueryScan: + if (((Scan *) plan)->scanrelid > 0) + { + RangeTblEntry *rte = rt_fetch(((Scan *) plan)->scanrelid, + es->rtable); + + appendStringInfo(str, " %s", + stringStringInfo(rte->eref->relname)); } break; default: @@ -284,7 +277,8 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es) for (i = 0; i < indent; i++) appendStringInfo(str, " "); appendStringInfo(str, " -> "); - explain_outNode(str, ((SubPlan *) lfirst(lst))->plan, indent + 2, es); + explain_outNode(str, ((SubPlan *) lfirst(lst))->plan, + indent + 4, es); } es->rtable = saved_rtable; } @@ -307,32 +301,12 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es) explain_outNode(str, innerPlan(plan), indent + 3, es); } - /* subPlan-s */ - if (plan->subPlan) - { - List *saved_rtable = es->rtable; - List *lst; - - for (i = 0; i < indent; i++) - appendStringInfo(str, " "); - appendStringInfo(str, " SubPlan\n"); - foreach(lst, plan->subPlan) - { - es->rtable = ((SubPlan *) lfirst(lst))->rtable; - for (i = 0; i < indent; i++) - appendStringInfo(str, " "); - appendStringInfo(str, " -> "); - explain_outNode(str, ((SubPlan *) lfirst(lst))->plan, indent + 4, es); - } - es->rtable = saved_rtable; - } - - if (nodeTag(plan) == T_Append) + if (IsA(plan, Append)) { + Append *appendplan = (Append *) plan; List *saved_rtable = es->rtable; - List *lst; int whichplan = 0; - Append *appendplan = (Append *) plan; + List *lst; foreach(lst, appendplan->appendplans) { @@ -351,14 +325,55 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es) for (i = 0; i < indent; i++) appendStringInfo(str, " "); - appendStringInfo(str, " -> "); + appendStringInfo(str, " -> "); - explain_outNode(str, subnode, indent + 4, es); + explain_outNode(str, subnode, indent + 3, es); whichplan++; } es->rtable = saved_rtable; } + + if (IsA(plan, SubqueryScan)) + { + SubqueryScan *subqueryscan = (SubqueryScan *) plan; + Plan *subnode = subqueryscan->subplan; + RangeTblEntry *rte = rt_fetch(subqueryscan->scan.scanrelid, + es->rtable); + List *saved_rtable = es->rtable; + + Assert(rte->subquery != NULL); + es->rtable = rte->subquery->rtable; + + for (i = 0; i < indent; i++) + appendStringInfo(str, " "); + appendStringInfo(str, " -> "); + + explain_outNode(str, subnode, indent + 3, es); + + es->rtable = saved_rtable; + } + + /* subPlan-s */ + if (plan->subPlan) + { + List *saved_rtable = es->rtable; + List *lst; + + for (i = 0; i < indent; i++) + appendStringInfo(str, " "); + appendStringInfo(str, " SubPlan\n"); + foreach(lst, plan->subPlan) + { + es->rtable = ((SubPlan *) lfirst(lst))->rtable; + for (i = 0; i < indent; i++) + appendStringInfo(str, " "); + appendStringInfo(str, " -> "); + explain_outNode(str, ((SubPlan *) lfirst(lst))->plan, + indent + 4, es); + } + es->rtable = saved_rtable; + } } static char * -- cgit v1.2.3