makeTargetEntry cleanup.

diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index 1dfbbee..9e4937e 100644 (file)
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.12 1998/07/20 19:53:44 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.13 1998/07/20 20:48:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
 #include "access/heapam.h"
 #include "executor/executor.h"
 #include "nodes/relation.h"
-#include "optimizer/tlist.h"   /* for makeTargetEntry */
+#include "nodes/makefuncs.h"
 
 /*-------------------------------------------------------------------------
  *             XXX this stuff should be rewritten to take advantage

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index fe1d54c..65f40f4 100644 (file)
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.78 1998/07/20 19:53:49 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.79 1998/07/20 20:48:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -317,7 +317,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
                                                                        att[defval[ndef].adnum - 1]->atttypmod,
                                                                        pstrdup(nameout(&(att[defval[ndef].adnum - 1]->attname))),
                                                                        0, 0, 0),
-                                               (Node *) stringToNode(defval[ndef].adbin);
+                                               (Node *) stringToNode(defval[ndef].adbin));
                        qry->targetList = lappend(qry->targetList, te);
                }
        }

diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index 62ed3d7..5884832 100644 (file)
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: makefuncs.h,v 1.12 1998/07/12 21:29:31 momjian Exp $
+ * $Id: makefuncs.h,v 1.13 1998/07/20 20:48:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,6 +14,7 @@
 #define MAKEFUNC_H
 
 #include <nodes/primnodes.h>
+#include <nodes/parsenodes.h>
 #include <utils/fcache.h>
 
 extern Oper *
@@ -32,6 +33,9 @@ makeVar(Index varno,
                Index varnoold,
                AttrNumber varoattno);
 
+extern TargetEntry *
+makeTargetEntry(Resdom *resdom, Node *expr);
+
 extern Resdom *
 makeResdom(AttrNumber resno,
                   Oid restype,

diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 924b53b..d15dc07 100644 (file)
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.10 1998/07/20 19:53:53 momjian Exp $
+ * $Id: tlist.h,v 1.11 1998/07/20 20:48:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,9 +26,6 @@ extern List *get_actual_tlist(List *tlist);
 extern Resdom *tlist_member(Var *var, List *tlist);
 extern Resdom *tlist_resdom(List *tlist, Resdom *resnode);
 
-extern TargetEntry *makeTargetEntry(Resdom *resdom, Node *expr);
-extern Var *get_expr(TargetEntry *tle);
-
 extern TargetEntry *match_varid(Var *test_var, List *tlist);
 extern List *new_unsorted_tlist(List *targetlist);
 extern List *copy_vars(List *target, List *source);