rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-02 03:11:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up leftover bugs from recent COPY feature patch --- missed

Browse Source 
required changes to copyfuncs/equalfuncs.
This commit is contained in:
Tom Lane 2002-08-19 00:40:15 +00:00
parent 5f6a27f8f9
commit f4ad5e8d18
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/commands/copy.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.163 2002/08/15 16:36:02 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.164 2002/08/19 00:40:14 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1513,7 +1513,7 @@ CopyGetAttnums(Relation rel, List *attnamelist)
foreach(l, attnamelist) foreach(l, attnamelist)
{ {
char *name = strVal(lfirst(l)); char *name = ((Ident *) lfirst(l))->name;
int attnum; int attnum;
/* Lookup column name, elog on failure */ /* Lookup column name, elog on failure */

3
src/backend/nodes/copyfuncs.c
View File

@ -15,7 +15,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.202 2002/08/19 00:11:53 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.203 2002/08/19 00:40:14 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2016,6 +2016,7 @@ _copyCopyStmt(CopyStmt *from)
CopyStmt *newnode = makeNode(CopyStmt); CopyStmt *newnode = makeNode(CopyStmt);
Node_Copy(from, newnode, relation); Node_Copy(from, newnode, relation);
Node_Copy(from, newnode, attlist);
newnode->is_from = from->is_from; newnode->is_from = from->is_from;
if (from->filename) if (from->filename)
newnode->filename = pstrdup(from->filename); newnode->filename = pstrdup(from->filename);

4
src/backend/nodes/equalfuncs.c
View File

@ -20,7 +20,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.151 2002/08/19 00:11:53 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.152 2002/08/19 00:40:14 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -801,6 +801,8 @@ _equalCopyStmt(CopyStmt *a, CopyStmt *b)
{ {
if (!equal(a->relation, b->relation)) if (!equal(a->relation, b->relation))
return false; return false;
if (!equal(a->attlist, b->attlist))
return false;
if (a->is_from != b->is_from) if (a->is_from != b->is_from)
return false; return false;
if (!equalstr(a->filename, b->filename)) if (!equalstr(a->filename, b->filename))

4
src/include/nodes/parsenodes.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: parsenodes.h,v 1.199 2002/08/15 16:36:07 momjian Exp $ * $Id: parsenodes.h,v 1.200 2002/08/19 00:40:15 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -869,7 +869,7 @@ typedef struct CopyStmt
{ {
NodeTag type; NodeTag type;
RangeVar *relation; /* the relation to copy */ RangeVar *relation; /* the relation to copy */
List *attlist; List *attlist; /* List of Ident nodes, or NIL for all */
bool is_from; /* TO or FROM */ bool is_from; /* TO or FROM */
char *filename; /* if NULL, use stdin/stdout */ char *filename; /* if NULL, use stdin/stdout */
List *options; /* List of DefElem nodes */ List *options; /* List of DefElem nodes */