NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7603c42

committed

Rod's patch does what it is supposed to do, but it also includes

some old code to add PK constraints to CREATE TABLE. That stuffhad been removed as part of my original patch for pg_dump alittle while ago.The attached patch fixes this by removing (again :-) ) thecode in dumpTables() to perform PK creation during CREATETABLE. I briefly tested it locally and it fixes both ofTom's test cases.Please apply.Cheers,Neil--Neil Conway <neilconway@rogers.com>

1 parentb73859d commit7603c42Copy full SHA for 7603c42

File tree

1 file changed

-31

lines changed

src/bin/pg_dump
- pg_dump.c

1 file changed

-31

lines changed

`‎src/bin/pg_dump/pg_dump.c`

Lines changed: 1 addition & 31 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`*`
`24`	`24`	`* IDENTIFICATION`
`25`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.247 2002/04/11 20:00:06 tgl Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.248 2002/04/13 19:57:18 momjian Exp $`
`26`	`26`	`*`
`27`	`27`	`*-------------------------------------------------------------------------`
`28`	`28`	`*/`
`@@ -4418,36 +4418,6 @@ dumpTables(Archive fout, TableInfo tblinfo, int numTables,`
`4418`	`4418`	`tblinfo[i].check_expr[k]);`
`4419`	`4419`	`}`
`4420`	`4420`
`4421`		`-/* Primary Key */`
`4422`		`-if (tblinfo[i].pkIndexOid!=NULL)`
`4423`		`-{`
`4424`		`-PQExpBufferconsDef;`
`4425`		`-`
`4426`		`-/* Find the corresponding index */`
`4427`		`-for (k=0;k<numIndexes;k++)`
`4428`		`-{`
`4429`		`-if (strcmp(indinfo[k].indexreloid,`
`4430`		`-tblinfo[i].pkIndexOid)==0)`
`4431`		`-break;`
`4432`		`-}`
`4433`		`-`
`4434`		`-if (k >=numIndexes)`
`4435`		`-{`
`4436`		`-write_msg(NULL,"dumpTables(): failed sanity check, could not find index (%s) for primary key constraint\n",`
`4437`		`-tblinfo[i].pkIndexOid);`
`4438`		`-exit_nicely();`
`4439`		`-}`
`4440`		`-`
`4441`		`-consDef=getPKconstraint(&tblinfo[i],&indinfo[k]);`
`4442`		`-`
`4443`		`-if ((actual_atts+tblinfo[i].ncheck)>0)`
`4444`		`-appendPQExpBuffer(q,",\n\t");`
`4445`		`-`
`4446`		`-appendPQExpBuffer(q,"%s",consDef->data);`
`4447`		`-`
`4448`		`-destroyPQExpBuffer(consDef);`
`4449`		`-}`
`4450`		`-`
`4451`	`4421`	`/*`
`4452`	`4422`	`* Primary Key: In versions of PostgreSQL prior to 7.2, we`
`4453`	`4423`	`* needed to include the primary key in the table definition.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7603c42

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/pg_dump.c`

0 commit comments