1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00

Run perltidy on 002_pg_upgrade.pl.

This commit is contained in:
Jeff Davis
2024-03-09 11:51:10 -08:00
parent 5ba8b70deb
commit b0289574bd

View File

@ -255,8 +255,7 @@ if (defined($ENV{oldinstall}))
# For simplicity, use the newer version's psql to issue the commands. # For simplicity, use the newer version's psql to issue the commands.
$newnode->command_ok( $newnode->command_ok(
[ [
'psql', '-X', 'psql', '-X', '-v', 'ON_ERROR_STOP=1',
'-v', 'ON_ERROR_STOP=1',
'-d', $oldnode->connstr($updb), '-d', $oldnode->connstr($updb),
@command_args, @command_args,
], ],
@ -322,7 +321,8 @@ if (defined($ENV{oldinstall}))
} }
# Create an invalid database, will be deleted below # Create an invalid database, will be deleted below
$oldnode->safe_psql('postgres', qq( $oldnode->safe_psql(
'postgres', qq(
CREATE DATABASE regression_invalid; CREATE DATABASE regression_invalid;
UPDATE pg_database SET datconnlimit = -2 WHERE datname = 'regression_invalid'; UPDATE pg_database SET datconnlimit = -2 WHERE datname = 'regression_invalid';
)); ));
@ -365,7 +365,7 @@ command_checks_all(
$mode, '--check', $mode, '--check',
], ],
1, 1,
[qr/invalid/], # pg_upgrade prints errors on stdout :( [qr/invalid/], # pg_upgrade prints errors on stdout :(
[qr//], [qr//],
'invalid database causes failure'); 'invalid database causes failure');
rmtree($newnode->data_dir . "/pg_upgrade_output.d"); rmtree($newnode->data_dir . "/pg_upgrade_output.d");