Commit5ba8b70

committed

Fix cross-version pg_upgrade test.

Pass each statement as a separate '-c' arg, so they don't get combinedinto a single transaction.Discussion:https://postgr.es/m/bca97aecb50b2026b7dbc26604bf31861c819a64.camel@j-davis.comReviewed-by: Tom Lane

1 parentf160bf0 commit5ba8b70Copy full SHA for 5ba8b70

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -246,15 +246,19 @@ sub filter_dump`
`246`	`246`
`247`	`247`	`foreachmy$updb (keys%$adjust_cmds)`
`248`	`248`	`{`
`249`		`-my$upcmds =join(";\n", @{$adjust_cmds->{$updb} });`
	`249`	`+my@command_args = ();`
	`250`	`+formy$upcmd (@{$adjust_cmds->{$updb} })`
	`251`	`+{`
	`252`	`+push@command_args,'-c',$upcmd;`
	`253`	`+}`
`250`	`254`
`251`	`255`	`# For simplicity, use the newer version's psql to issue the commands.`
`252`	`256`	`$newnode->command_ok(`
`253`	`257`	`[`
`254`	`258`	`'psql','-X',`
`255`	`259`	`'-v','ON_ERROR_STOP=1',`
`256`		`-'-c',$upcmds,`
`257`	`260`	`'-d',$oldnode->connstr($updb),`
	`261`	`+@command_args,`
`258`	`262`	`],`
`259`	`263`	`"ran version adaptation commands for database$updb");`
`260`	`264`	`}`

Comments

(0)