3 files changed, 39 insertions, 28 deletions

diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl
index 0be9f6dd538..c3c5fae11ea 100644
--- a/src/bin/pg_dump/t/001_basic.pl
+++ b/src/bin/pg_dump/t/001_basic.pl
@@ -240,17 +240,20 @@ command_fails_like(
 command_fails_like(
 	[ 'pg_restore', '--exclude-database=foo', '--globals-only', '-d', 'xxx' ],
 	qr/\Qpg_restore: error: option --exclude-database cannot be used together with -g\/--globals-only\E/,
-	'pg_restore: option --exclude-database cannot be used together with -g/--globals-only');
+	'pg_restore: option --exclude-database cannot be used together with -g/--globals-only'
+);
 
 command_fails_like(
 	[ 'pg_restore', '--exclude-database=foo', '-d', 'xxx', 'dumpdir' ],
 	qr/\Qpg_restore: error: option --exclude-database can be used only when restoring an archive created by pg_dumpall\E/,
-	'When option --exclude-database is used in pg_restore with dump of pg_dump');
+	'When option --exclude-database is used in pg_restore with dump of pg_dump'
+);
 
 command_fails_like(
 	[ 'pg_restore', '--globals-only', '-d', 'xxx', 'dumpdir' ],
 	qr/\Qpg_restore: error: option -g\/--globals-only can be used only when restoring an archive created by pg_dumpall\E/,
-	'When option --globals-only is not used in pg_restore with dump of pg_dump');
+	'When option --globals-only is not used in pg_restore with dump of pg_dump'
+);
 
 # also fails for -r and -t, but it seems pointless to add more tests for those.
 command_fails_like(
diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index e1cfa99874e..2485d8f360e 100644
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -368,7 +368,7 @@ my %pgdump_runs = (
 			'--data-only',
 			'--superuser' => 'test_superuser',
 			'--disable-triggers',
-			'--verbose',         # no-op, just make sure it works
+			'--verbose',    # no-op, just make sure it works
 			'postgres',
 		],
 	},
@@ -810,8 +810,7 @@ my %pgdump_runs = (
 		dump_cmd => [
 			'pg_dump', '--no-sync',
 			"--file=$tempdir/no_schema.sql", '--no-schema',
-			'--with-statistics',
-			'postgres',
+			'--with-statistics', 'postgres',
 		],
 	},);
 
diff --git a/src/bin/pg_dump/t/006_pg_dumpall.pl b/src/bin/pg_dump/t/006_pg_dumpall.pl
index 0ea02a3a4a9..c274b777586 100644
--- a/src/bin/pg_dump/t/006_pg_dumpall.pl
+++ b/src/bin/pg_dump/t/006_pg_dumpall.pl
@@ -294,17 +294,17 @@ my %pgdumpall_runs = (
 			'--format' => 'directory',
 			'--globals-only',
 			'--file' => "$tempdir/dump_globals_only",
-			],
-			restore_cmd => [
-				'pg_restore', '-C', '--globals-only',
-				'--format' => 'directory',
-				'--file' => "$tempdir/dump_globals_only.sql",
-				"$tempdir/dump_globals_only",
-				],
-				like => qr/
+		],
+		restore_cmd => [
+			'pg_restore', '-C', '--globals-only',
+			'--format' => 'directory',
+			'--file' => "$tempdir/dump_globals_only.sql",
+			"$tempdir/dump_globals_only",
+		],
+		like => qr/
             ^\s*\QCREATE ROLE dumpall;\E\s*\n
 			/xm
-			}, );
+	},);
 
 # First execute the setup_sql
 foreach my $run (sort keys %pgdumpall_runs)
@@ -339,7 +339,8 @@ foreach my $run (sort keys %pgdumpall_runs)
 	# pg_restore --file output file.
 	my $output_file = slurp_file("$tempdir/${run}.sql");
 
-	if (!($pgdumpall_runs{$run}->{like}) && !($pgdumpall_runs{$run}->{unlike}))
+	if (   !($pgdumpall_runs{$run}->{like})
+		&& !($pgdumpall_runs{$run}->{unlike}))
 	{
 		die "missing \"like\" or \"unlike\" in test \"$run\"";
 	}
@@ -361,30 +362,38 @@ foreach my $run (sort keys %pgdumpall_runs)
 # Some negative test case with dump of pg_dumpall and restore using pg_restore
 # test case 1: when -C is not used in pg_restore with dump of pg_dumpall
 $node->command_fails_like(
-    [ 'pg_restore',
-    "$tempdir/format_custom",
-    '--format' => 'custom',
-    '--file' => "$tempdir/error_test.sql", ],
-    qr/\Qpg_restore: error: option -C\/--create must be specified when restoring an archive created by pg_dumpall\E/,
-    'When -C is not used in pg_restore with dump of pg_dumpall');
+	[
+		'pg_restore',
+		"$tempdir/format_custom",
+		'--format' => 'custom',
+		'--file' => "$tempdir/error_test.sql",
+	],
+	qr/\Qpg_restore: error: option -C\/--create must be specified when restoring an archive created by pg_dumpall\E/,
+	'When -C is not used in pg_restore with dump of pg_dumpall');
 
 # test case 2: When --list option is used with dump of pg_dumpall
 $node->command_fails_like(
-	[ 'pg_restore',
+	[
+		'pg_restore',
 		"$tempdir/format_custom", '-C',
-		'--format' => 'custom', '--list',
-		'--file' => "$tempdir/error_test.sql", ],
+		'--format' => 'custom',
+		'--list',
+		'--file' => "$tempdir/error_test.sql",
+	],
 	qr/\Qpg_restore: error: option -l\/--list cannot be used when restoring an archive created by pg_dumpall\E/,
 	'When --list is used in pg_restore with dump of pg_dumpall');
 
 # test case 3: When non-exist database is given with -d option
 $node->command_fails_like(
-	[ 'pg_restore',
+	[
+		'pg_restore',
 		"$tempdir/format_custom", '-C',
 		'--format' => 'custom',
-		'-d' => 'dbpq', ],
+		'-d' => 'dbpq',
+	],
 	qr/\Qpg_restore: error: could not connect to database "dbpq"\E/,
-	'When non-existent database is given with -d option in pg_restore with dump of pg_dumpall');
+	'When non-existent database is given with -d option in pg_restore with dump of pg_dumpall'
+);
 
 $node->stop('fast');