Commitf4ad5e8

committed

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

required changes to copyfuncs/equalfuncs.

1 parent5f6a27f commitf4ad5e8Copy full SHA for f4ad5e8

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.163 2002/08/15 16:36:02 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.164 2002/08/19 00:40:14 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1513,7 +1513,7 @@ CopyGetAttnums(Relation rel, List *attnamelist)`
`1513`	`1513`
`1514`	`1514`	`foreach(l,attnamelist)`
`1515`	`1515`	`{`
`1516`		`-char*name=strVal(lfirst(l));`
	`1516`	`+charname=((Ident)lfirst(l))->name;`
`1517`	`1517`	`intattnum;`
`1518`	`1518`
`1519`	`1519`	`/* Lookup column name, elog on failure */`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* Portions Copyright (c) 1994, Regents of the University of California`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.202 2002/08/19 00:11:53 tgl Exp $`
	`18`	`+ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.203 2002/08/19 00:40:14 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -2016,6 +2016,7 @@ _copyCopyStmt(CopyStmt *from)`
`2016`	`2016`	`CopyStmt*newnode=makeNode(CopyStmt);`
`2017`	`2017`
`2018`	`2018`	`Node_Copy(from,newnode,relation);`
	`2019`	`+Node_Copy(from,newnode,attlist);`
`2019`	`2020`	`newnode->is_from=from->is_from;`
`2020`	`2021`	`if (from->filename)`
`2021`	`2022`	`newnode->filename=pstrdup(from->filename);`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`* Portions Copyright (c) 1994, Regents of the University of California`
`21`	`21`	`*`
`22`	`22`	`* IDENTIFICATION`
`23`		`- * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.151 2002/08/19 00:11:53 tgl Exp $`
	`23`	`+ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.152 2002/08/19 00:40:14 tgl Exp $`
`24`	`24`	`*`
`25`	`25`	`*-------------------------------------------------------------------------`
`26`	`26`	`*/`
`@@ -801,6 +801,8 @@ _equalCopyStmt(CopyStmt a, CopyStmt b)`
`801`	`801`	`{`
`802`	`802`	`if (!equal(a->relation,b->relation))`
`803`	`803`	`return false;`
	`804`	`+if (!equal(a->attlist,b->attlist))`
	`805`	`+return false;`
`804`	`806`	`if (a->is_from!=b->is_from)`
`805`	`807`	`return false;`
`806`	`808`	`if (!equalstr(a->filename,b->filename))`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: parsenodes.h,v 1.199 2002/08/15 16:36:07 momjian Exp $`
	`10`	`+ * $Id: parsenodes.h,v 1.200 2002/08/19 00:40:15 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -869,7 +869,7 @@ typedef struct CopyStmt`
`869`	`869`	`{`
`870`	`870`	`NodeTagtype;`
`871`	`871`	`RangeVarrelation;/ the relation to copy */`
`872`		`-List*attlist;`
	`872`	`+Listattlist;/ List of Ident nodes, or NIL for all */`
`873`	`873`	`boolis_from;/* TO or FROM */`
`874`	`874`	`charfilename;/ if NULL, use stdin/stdout */`
`875`	`875`	`Listoptions;/ List of DefElem nodes */`

Comments

(0)