Skip to content

Commit 1d00134

Browse files
committed
makeTargetEntry cleanup.
1 parent 61700b4 commit 1d00134

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

src/backend/executor/execJunk.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.12 1998/07/20 19:53:44 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.13 1998/07/20 20:48:50 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -20,7 +20,7 @@
2020
#include "access/heapam.h"
2121
#include "executor/executor.h"
2222
#include "nodes/relation.h"
23-
#include "optimizer/tlist.h" /* for makeTargetEntry */
23+
#include "nodes/makefuncs.h"
2424

2525
/*-------------------------------------------------------------------------
2626
* XXX this stuff should be rewritten to take advantage

src/backend/parser/analyze.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.78 1998/07/20 19:53:49 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.79 1998/07/20 20:48:51 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -317,7 +317,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
317317
att[defval[ndef].adnum - 1]->atttypmod,
318318
pstrdup(nameout(&(att[defval[ndef].adnum - 1]->attname))),
319319
0, 0, 0),
320-
(Node *) stringToNode(defval[ndef].adbin);
320+
(Node *) stringToNode(defval[ndef].adbin));
321321
qry->targetList = lappend(qry->targetList, te);
322322
}
323323
}

src/include/nodes/makefuncs.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: makefuncs.h,v 1.12 1998/07/12 21:29:31 momjian Exp $
9+
* $Id: makefuncs.h,v 1.13 1998/07/20 20:48:52 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndef MAKEFUNC_H
1414
#define MAKEFUNC_H
1515

1616
#include <nodes/primnodes.h>
17+
#include <nodes/parsenodes.h>
1718
#include <utils/fcache.h>
1819

1920
extern Oper *
@@ -32,6 +33,9 @@ makeVar(Index varno,
3233
Index varnoold,
3334
AttrNumber varoattno);
3435

36+
extern TargetEntry *
37+
makeTargetEntry(Resdom *resdom, Node *expr);
38+
3539
extern Resdom *
3640
makeResdom(AttrNumber resno,
3741
Oid restype,

src/include/optimizer/tlist.h

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: tlist.h,v 1.10 1998/07/20 19:53:53 momjian Exp $
9+
* $Id: tlist.h,v 1.11 1998/07/20 20:48:54 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -26,9 +26,6 @@ extern List *get_actual_tlist(List *tlist);
2626
extern Resdom *tlist_member(Var *var, List *tlist);
2727
extern Resdom *tlist_resdom(List *tlist, Resdom *resnode);
2828

29-
extern TargetEntry *makeTargetEntry(Resdom *resdom, Node *expr);
30-
extern Var *get_expr(TargetEntry *tle);
31-
3229
extern TargetEntry *match_varid(Var *test_var, List *tlist);
3330
extern List *new_unsorted_tlist(List *targetlist);
3431
extern List *copy_vars(List *target, List *source);

0 commit comments

Comments
 (0)