Commit3ef151e

committed

Fix pg_restore -n option to do what the man page says it does. The

original coding only worked if one of the selTypes restriction optionswas also given. Per report from Nick Johnson.

1 parent1cae920 commit3ef151eCopy full SHA for 3ef151e

File tree

+12

-12

lines changed

+12

-12

lines changed

Lines changed: 11 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.125 2006/02/14 23:30:43 tgl Exp $`
	`18`	`+ *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.126 2006/04/12 22:18:48 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -1908,17 +1908,18 @@ _tocEntryRequired(TocEntry te, RestoreOptions ropt, bool include_acls)`
`1908`	`1908`	`if (!ropt->create&&strcmp(te->desc,"DATABASE")==0)`
`1909`	`1909`	`return0;`
`1910`	`1910`
`1911`		`-/* Check if tablename only is wanted */`
	`1911`	`+/* Check options for selective dump/restore */`
	`1912`	`+if (ropt->schemaNames)`
	`1913`	`+{`
	`1914`	`+/* If no namespace is specified, it means all. */`
	`1915`	`+if (!te->namespace)`
	`1916`	`+return0;`
	`1917`	`+if (strcmp(ropt->schemaNames,te->namespace)!=0)`
	`1918`	`+return0;`
	`1919`	`+}`
	`1920`	`+`
`1912`	`1921`	`if (ropt->selTypes)`
`1913`	`1922`	`{`
`1914`		`-if (ropt->schemaNames)`
`1915`		`-{`
`1916`		`-/* If no namespace is specified, it means all. */`
`1917`		`-if (!te->namespace)`
`1918`		`-return0;`
`1919`		`-if (strcmp(ropt->schemaNames,te->namespace)!=0)`
`1920`		`-return0;`
`1921`		`-}`
`1922`	`1923`	`if (strcmp(te->desc,"TABLE")==0\|\|`
`1923`	`1924`	`strcmp(te->desc,"TABLE DATA")==0)`
`1924`	`1925`	`{`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`*`
`36`	`36`	`* IDENTIFICATION`
`37`		`- *$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.76 2006/02/1206:11:51 momjian Exp $`
	`37`	`+ *$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.77 2006/04/1222:18:48 tgl Exp $`
`38`	`38`	`*`
`39`	`39`	`*-------------------------------------------------------------------------`
`40`	`40`	`*/`
`@@ -188,7 +188,6 @@ main(int argc, char **argv)`
`188`	`188`	`break;`
`189`	`189`
`190`	`190`	`case'n':/* Dump data for this schema only */`
`191`		`-opts->selTypes=1;`
`192`	`191`	`opts->schemaNames=strdup(optarg);`
`193`	`192`	`break;`
`194`	`193`

Comments

(0)