Commit2ef5790

committed

Fix a couple of error messages and tests for them

oversights in1495eff and289f74d. Mea culpa.

1 parent8ec0aae commit2ef5790Copy full SHA for 2ef5790

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -505,17 +505,17 @@ main(int argc, char **argv)`
`505`	`505`	`* dump.`
`506`	`506`	`*/`
`507`	`507`	`if (opts->tocSummary)`
`508`		`-pg_fatal("option -l/--list cannot be used when restoring an archive createdwith pg_dumpall");`
	`508`	`+pg_fatal("option -l/--list cannot be used when restoring an archive createdby pg_dumpall");`
`509`	`509`	`elseif (opts->tocFile)`
`510`		`-pg_fatal("option -L/--use-list cannot be used when restoring an archive createdwith pg_dumpall");`
	`510`	`+pg_fatal("option -L/--use-list cannot be used when restoring an archive createdby pg_dumpall");`
`511`	`511`
`512`	`512`	`/*`
`513`	`513`	`* To restore from a pg_dumpall archive, -C (create database) option`
`514`	`514`	`* must be specified unless we are only restoring globals.`
`515`	`515`	`*/`
`516`	`516`	`if (!globals_only&&opts->createDB!=1)`
`517`	`517`	`{`
`518`		`-pg_log_error("-C/--create option should be specified when restoringfroman archive of created by pg_dumpall");`
	`518`	`+pg_log_error("-C/--create option should be specified when restoring an archive created by pg_dumpall");`
`519`	`519`	`pg_log_error_hint("Try \"%s --help\" for more information.",progname);`
`520`	`520`	`pg_log_error_hint("Individual databases can be restored using their specific archives.");`
`521`	`521`	`exit_nicely(1);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -244,12 +244,12 @@`
`244`	`244`
`245`	`245`	`command_fails_like(`
`246`	`246`	`['pg_restore','--exclude-database=foo','-d','xxx','dumpdir' ],`
`247`		`-qr/\Qpg_restore: error: option --exclude-database can be used only when restoringmultiple databases byarchiveof pg_dumpall\E/,`
	`247`	`+qr/\Qpg_restore: error: option --exclude-database can be used only when restoringanarchivecreated by pg_dumpall\E/,`
`248`	`248`	`'When option --exclude-database is used in pg_restore with dump of pg_dump');`
`249`	`249`
`250`	`250`	`command_fails_like(`
`251`	`251`	`['pg_restore','--globals-only','-d','xxx','dumpdir' ],`
`252`		`-qr/\Qpg_restore: error: option -g\/--globals-only can be used only when restoringmultiple databases byarchiveof pg_dumpall\E/,`
	`252`	`+qr/\Qpg_restore: error: option -g\/--globals-only can be used only when restoringanarchivecreated by pg_dumpall\E/,`
`253`	`253`	`'When option --globals-only is not used in pg_restore with dump of pg_dump');`
`254`	`254`
`255`	`255`	`# also fails for -r and -t, but it seems pointless to add more tests for those.`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@`
`365`	`365`	`"$tempdir/format_custom",`
`366`	`366`	`'--format' => 'custom',`
`367`	`367`	`'--file' => "$tempdir/error_test.sql", ],`
`368`		`- qr/\Qpg_restore: error: -C\/--create option should be specified when restoringmultiple databases byarchiveof pg_dumpall\E/,`
	`368`	`+ qr/\Qpg_restore: error: -C\/--create option should be specified when restoringanarchivecreated by pg_dumpall\E/,`
`369`	`369`	`'When -C is not used in pg_restore with dump of pg_dumpall');`
`370`	`370`
`371`	`371`	`# test case 2: When --list option is used with dump of pg_dumpall`
`@@ -374,7 +374,7 @@`
`374`	`374`	`"$tempdir/format_custom", '-C',`
`375`	`375`	`'--format' => 'custom', '--list',`
`376`	`376`	`'--file' => "$tempdir/error_test.sql", ],`
`377`		`-qr/\Qpg_restore: error: option -l\/--list cannot be used when restoringmultiple databases byarchiveof pg_dumpall\E/,`
	`377`	`+qr/\Qpg_restore: error: option -l\/--list cannot be used when restoringanarchivecreated by pg_dumpall\E/,`
`378`	`378`	`'When --list is used in pg_restore with dump of pg_dumpall');`
`379`	`379`
`380`	`380`	`# test case 3: When non-exist database is given with -d option`

Comments

(0)