perltidy: Add option --nooutdent-long-quotes

src/bin/pg_basebackup/t/010_pg_basebackup.pl

@@ -420,13 +420,15 @@ rmtree("$tempdir/backupxs_slot");
 
 is( $node->safe_psql(
 		'postgres',
-q{SELECT slot_name FROM pg_replication_slots WHERE slot_name = 'slot0'}),
+		q{SELECT slot_name FROM pg_replication_slots WHERE slot_name = 'slot0'}
+	),
 	'slot0',
 	'replication slot was created');
 isnt(
 	$node->safe_psql(
 		'postgres',
-q{SELECT restart_lsn FROM pg_replication_slots WHERE slot_name = 'slot0'}),
+		q{SELECT restart_lsn FROM pg_replication_slots WHERE slot_name = 'slot0'}
+	),
 	'',
 	'restart LSN of new slot is not null');
 

src/bin/pg_controldata/t/001_pg_controldata.pl

@@ -33,8 +33,7 @@ close $fh;
 command_checks_all(
 	[ 'pg_controldata', $node->data_dir ],
 	0,
-	[
+	[   qr/WARNING: Calculated CRC checksum does not match value stored in file/,
-qr/WARNING: Calculated CRC checksum does not match value stored in file/,
 		qr/WARNING: invalid WAL segment size/ ],
 	[qr/^$/],
 	'pg_controldata with corrupted pg_control');

src/bin/pg_dump/t/001_basic.pl

@@ -68,7 +68,8 @@ qr/\Qpg_dump: options -c\/--clean and -a\/--data-only cannot be used together\E/
 command_fails_like(
 	[ 'pg_restore', '-c', '-a' ],
 	qr/\Qpg_restore: options -c\/--clean and -a\/--data-only cannot be used together\E/,
-'pg_restore: options -c/--clean and -a/--data-only cannot be used together');
+	'pg_restore: options -c/--clean and -a/--data-only cannot be used together'
+);
 
 command_fails_like(
 	[ 'pg_dump', '--inserts', '-o' ],

src/bin/pg_resetwal/t/002_corrupted.pl

@@ -31,8 +31,7 @@ command_checks_all(
 	[ 'pg_resetwal', '-n', $node->data_dir ],
 	0,
 	[qr/pg_control version number/],
-	[
+	[   qr/pg_resetwal: pg_control exists but is broken or wrong version; ignoring it/
-qr/pg_resetwal: pg_control exists but is broken or wrong version; ignoring it/
 	],
 	'processes corrupted pg_control all zeroes');
 
@@ -47,7 +46,6 @@ command_checks_all(
 	[ 'pg_resetwal', '-n', $node->data_dir ],
 	0,
 	[qr/pg_control version number/],
-	[
+	[   qr/\Qpg_resetwal: pg_control specifies invalid WAL segment size (0 bytes); proceed with caution\E/
-qr/\Qpg_resetwal: pg_control specifies invalid WAL segment size (0 bytes); proceed with caution\E/
 	],
 	'processes zero WAL segment size');

src/bin/pg_rewind/t/003_extrafiles.pl

@@ -75,7 +75,8 @@ sub run_test
 			"$test_master_datadir/tst_standby_dir/standby_file1",
 			"$test_master_datadir/tst_standby_dir/standby_file2",
 			"$test_master_datadir/tst_standby_dir/standby_subdir",
-"$test_master_datadir/tst_standby_dir/standby_subdir/standby_file3" ],
+			"$test_master_datadir/tst_standby_dir/standby_subdir/standby_file3"
+		],
 		"file lists match");
 
 	RewindTest::clean_rewind_test();

src/bin/pgbench/t/002_pgbench_no_server.pl

@@ -114,8 +114,7 @@ my @options = (
 		[ qr{unrecognized initialization step}, qr{allowed steps are} ] ],
 	[   'bad random seed',
 		'--random-seed=one',
-		[
+		[   qr{unrecognized random seed option "one": expecting an unsigned integer, "time" or "rand"},
-qr{unrecognized random seed option "one": expecting an unsigned integer, "time" or "rand"},
 			qr{error while setting random seed from --random-seed option} ] ],
 
 	# loging sub-options

src/test/authentication/t/001_password.pl

@@ -60,7 +60,8 @@ $node->safe_psql('postgres',
 	"SET password_encryption='scram-sha-256'; CREATE ROLE scram_role LOGIN PASSWORD 'pass';"
 );
 $node->safe_psql('postgres',
-"SET password_encryption='md5'; CREATE ROLE md5_role LOGIN PASSWORD 'pass';");
+	"SET password_encryption='md5'; CREATE ROLE md5_role LOGIN PASSWORD 'pass';"
+);
 $ENV{"PGPASSWORD"} = 'pass';
 
 # For "trust" method, all users should be able to connect.

src/test/recovery/t/006_logical_decoding.pl

@@ -24,7 +24,8 @@ $node_master->safe_psql('postgres',
 	qq[CREATE TABLE decoding_test(x integer, y text);]);
 
 $node_master->safe_psql('postgres',
-qq[SELECT pg_create_logical_replication_slot('test_slot', 'test_decoding');]);
+	qq[SELECT pg_create_logical_replication_slot('test_slot', 'test_decoding');]
+);
 
 $node_master->safe_psql('postgres',
 	qq[INSERT INTO decoding_test(x,y) SELECT s, s::text FROM generate_series(1,10) s;]

src/test/recovery/t/010_logical_decoding_timelines.pl

@@ -60,7 +60,8 @@ $node_master->safe_psql('postgres',
 # the same physical copy trick, so:
 $node_master->safe_psql('postgres', 'CREATE DATABASE dropme;');
 $node_master->safe_psql('dropme',
-"SELECT pg_create_logical_replication_slot('dropme_slot', 'test_decoding');");
+	"SELECT pg_create_logical_replication_slot('dropme_slot', 'test_decoding');"
+);
 
 $node_master->safe_psql('postgres', 'CHECKPOINT;');
 

src/test/recovery/t/013_crash_restart.pl

@@ -220,7 +220,8 @@ is( $node->safe_psql('postgres', 'SELECT * FROM alive'),
 
 is( $node->safe_psql(
 		'postgres',
-'INSERT INTO alive VALUES($$before-orderly-restart$$) RETURNING status'),
+		'INSERT INTO alive VALUES($$before-orderly-restart$$) RETURNING status'
+	),
 	'before-orderly-restart',
 	'can still write after crash restart');
 

src/test/ssl/t/001_ssltests.pl

@@ -338,7 +338,8 @@ test_connect_fails(
 	$common_connstr,
 	"user=anotheruser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
 	qr/certificate authentication failed for user "anotheruser"/,
-"certificate authorization fails with client cert belonging to another user");
+	"certificate authorization fails with client cert belonging to another user"
+);
 
 # revoked client cert
 test_connect_fails(

src/tools/msvc/build.pl

@@ -66,7 +66,8 @@ elsif ($buildwhat)
 else
 {
 	system(
-"msbuild pgsql.sln /verbosity:normal $msbflags /p:Configuration=$bconf");
+		"msbuild pgsql.sln /verbosity:normal $msbflags /p:Configuration=$bconf"
+	);
 }
 
 # report status

src/tools/pgindent/perltidyrc

@@ -5,6 +5,7 @@
 --entab-leading-whitespace=4
 --keep-old-blank-lines=2
 --maximum-line-length=78
+--nooutdent-long-quotes
 --nospace-for-semicolon
 --opening-brace-on-new-line
 --output-line-ending=unix

src/tools/version_stamp.pl

@@ -83,8 +83,8 @@ my $aconfver = "";
 open(my $fh, '<', "configure.in") || die "could not read configure.in: $!\n";
 while (<$fh>)
 {
-	if (
+	if (m/^m4_if\(m4_defn\(\[m4_PACKAGE_VERSION\]\), \[(.*)\], \[\], \[m4_fatal/
-m/^m4_if\(m4_defn\(\[m4_PACKAGE_VERSION\]\), \[(.*)\], \[\], \[m4_fatal/)
+	  )
 	{
 		$aconfver = $1;
 		last;