aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/commands')
-rw-r--r--src/backend/commands/explain.c10
-rw-r--r--src/backend/commands/view.c9
2 files changed, 11 insertions, 8 deletions
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 8406416b765..2b152b2fe5b 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
*
- * $Id: explain.c,v 1.52 2000/01/26 05:56:13 momjian Exp $
+ * $Id: explain.c,v 1.53 2000/02/15 03:36:39 thomas Exp $
*
*/
@@ -230,12 +230,12 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es)
RangeTblEntry *rte = nth(((Scan *) plan)->scanrelid - 1, es->rtable);
appendStringInfo(str, " on ");
- if (strcmp(rte->refname, rte->relname) != 0)
+ if (strcmp(rte->ref->relname, rte->relname) != 0)
{
appendStringInfo(str, "%s ",
stringStringInfo(rte->relname));
}
- appendStringInfo(str, stringStringInfo(rte->refname));
+ appendStringInfo(str, stringStringInfo(rte->ref->relname));
}
break;
case T_TidScan:
@@ -244,12 +244,12 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es)
RangeTblEntry *rte = nth(((TidScan *) plan)->scan.scanrelid - 1, es->rtable);
appendStringInfo(str, " on ");
- if (strcmp(rte->refname, rte->relname) != 0)
+ if (strcmp(rte->ref->relname, rte->relname) != 0)
{
appendStringInfo(str, "%s ",
stringStringInfo(rte->relname));
}
- appendStringInfo(str, stringStringInfo(rte->refname));
+ appendStringInfo(str, stringStringInfo(rte->ref->relname));
}
break;
default:
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 8742b895dfd..f4bb18762b8 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: view.c,v 1.41 2000/01/26 05:56:14 momjian Exp $
+ * $Id: view.c,v 1.42 2000/02/15 03:36:39 thomas Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,6 +17,7 @@
#include "catalog/heap.h"
#include "commands/creatinh.h"
#include "commands/view.h"
+#include "nodes/makefuncs.h"
#include "parser/parse_relation.h"
#include "parser/parse_type.h"
#include "rewrite/rewriteDefine.h"
@@ -225,9 +226,11 @@ UpdateRangeTableOfViewParse(char *viewName, Query *viewParse)
* create the 2 new range table entries and form the new range
* table... CURRENT first, then NEW....
*/
- rt_entry1 = addRangeTableEntry(NULL, (char *) viewName, "*CURRENT*",
+ rt_entry1 = addRangeTableEntry(NULL, (char *) viewName,
+ makeAttr("*CURRENT*", NULL),
FALSE, FALSE, FALSE);
- rt_entry2 = addRangeTableEntry(NULL, (char *) viewName, "*NEW*",
+ rt_entry2 = addRangeTableEntry(NULL, (char *) viewName,
+ makeAttr("*NEW*", NULL),
FALSE, FALSE, FALSE);
new_rt = lcons(rt_entry2, old_rt);
new_rt = lcons(rt_entry1, new_rt);