Run pgperltidy

This is required before the creation of a new branch.  pgindent is
clean, as well as is reformat-dat-files.

perltidy version is v20230309, as documented in pgindent's README.

diff --git a/contrib/dblink/t/001_auth_scram.pl b/contrib/dblink/t/001_auth_scram.pl
index b087b38e5a58a56b8d55d17f066a171b540b58ba..8d6280656d51ef496ab874387bfa03381e470f19 100644 (file)
--- a/contrib/dblink/t/001_auth_scram.pl
+++ b/contrib/dblink/t/001_auth_scram.pl
@@ -103,10 +103,10 @@ test_fdw_auth_with_invalid_overwritten_require_auth($fdw_invalid_server);
 {
        my $connstr = $node1->connstr($db0) . qq' user=$user';
 
-       $node1->safe_psql($db0,
+       $node1->safe_psql(
+               $db0,
                qq'ALTER USER MAPPING FOR $user SERVER $fdw_server3 OPTIONS(add use_scram_passthrough \'false\')',
-               connstr => $connstr
-       );
+               connstr => $connstr);
 
        my ($ret, $stdout, $stderr) = $node1->psql(
                $db0,
@@ -114,10 +114,9 @@ test_fdw_auth_with_invalid_overwritten_require_auth($fdw_invalid_server);
                connstr => $connstr);
 
        is($ret, 3, 'SCRAM passthrough disabled on user mapping should fail');
-       like(
-               $stderr,
-               qr/password/i,
-               'expected password-related error when scram passthrough disabled on user mapping');
+       like($stderr, qr/password/i,
+               'expected password-related error when scram passthrough disabled on user mapping'
+       );
 }
 
 # Ensure that trust connections fail without superuser opt-in.

diff --git a/contrib/postgres_fdw/t/001_auth_scram.pl b/contrib/postgres_fdw/t/001_auth_scram.pl
index c4b57cd81b38df572e014c57aafa4e0ab1b65c23..972faf1f5529a4b143cb851b531ffbbbeac2062f 100644 (file)
--- a/contrib/postgres_fdw/t/001_auth_scram.pl
+++ b/contrib/postgres_fdw/t/001_auth_scram.pl
@@ -75,16 +75,19 @@ test_auth($node2, $db2, "t2",
 {
        my $connstr = $node1->connstr($db0) . qq' user=$user';
 
-       $node1->safe_psql($db0,
+       $node1->safe_psql(
+               $db0,
                qq'ALTER USER MAPPING FOR $user SERVER $fdw_server3 OPTIONS(add use_scram_passthrough \'false\')',
-               connstr => $connstr
-       );
+               connstr => $connstr);
 
        $node1->safe_psql(
                $db0,
                qq'CREATE FOREIGN TABLE override_t (g int, col2 int) SERVER $fdw_server3 OPTIONS (table_name \'t\');',
-               connstr => $connstr );
-       $node1->safe_psql($db0, qq'GRANT SELECT ON override_t TO $user;', connstr => $connstr);
+               connstr => $connstr);
+       $node1->safe_psql(
+               $db0,
+               qq'GRANT SELECT ON override_t TO $user;',
+               connstr => $connstr);
 
        my ($ret, $stdout, $stderr) = $node1->psql(
                $db0,
@@ -92,10 +95,9 @@ test_auth($node2, $db2, "t2",
                connstr => $connstr);
 
        is($ret, 3, 'SCRAM passthrough disabled on user mapping should fail');
-       like(
-               $stderr,
-               qr/password/i,
-               'expected password-related error when scram passthrough disabled on user mapping');
+       like($stderr, qr/password/i,
+               'expected password-related error when scram passthrough disabled on user mapping'
+       );
 }
 
 SKIP:

diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index 402d869710bd73facc61c12f4340f71c1a026785..1a985becde32def7ba7a28bc2485952b052b23a1 100644 (file)
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -8591,27 +8591,25 @@
   proname => 'pg_get_constraintdef', provolatile => 's', prorettype => 'text',
   proargtypes => 'oid bool', prosrc => 'pg_get_constraintdef_ext' },
 { oid => '6501', descr => 'get DDL to recreate a role',
-  proname => 'pg_get_role_ddl', prorows => '10', proisstrict => 't',
-  proretset => 't', provolatile => 's', pronargdefaults => '2',
-  prorettype => 'text', proargtypes => 'regrole bool bool',
-  proargnames => '{role,pretty,memberships}',
-  proargdefaults => '{false,true}', prosrc => 'pg_get_role_ddl' },
+  proname => 'pg_get_role_ddl', prorows => '10', proretset => 't',
+  provolatile => 's', pronargdefaults => '2', prorettype => 'text',
+  proargtypes => 'regrole bool bool',
+  proargnames => '{role,pretty,memberships}', proargdefaults => '{false,true}',
+  prosrc => 'pg_get_role_ddl' },
 { oid => '6499', descr => 'get DDL to recreate a tablespace',
-  proname => 'pg_get_tablespace_ddl', prorows => '10', proisstrict => 't',
-  proretset => 't', provolatile => 's', pronargdefaults => '2',
-  prorettype => 'text', proargtypes => 'oid bool bool',
-  proargnames => '{tablespace,pretty,owner}',
+  proname => 'pg_get_tablespace_ddl', prorows => '10', proretset => 't',
+  provolatile => 's', pronargdefaults => '2', prorettype => 'text',
+  proargtypes => 'oid bool bool', proargnames => '{tablespace,pretty,owner}',
   proargdefaults => '{false,true}', prosrc => 'pg_get_tablespace_ddl_oid' },
 { oid => '6500', descr => 'get DDL to recreate a tablespace',
-  proname => 'pg_get_tablespace_ddl', prorows => '10', proisstrict => 't',
-  proretset => 't', provolatile => 's', pronargdefaults => '2',
-  prorettype => 'text', proargtypes => 'name bool bool',
-  proargnames => '{tablespace,pretty,owner}',
+  proname => 'pg_get_tablespace_ddl', prorows => '10', proretset => 't',
+  provolatile => 's', pronargdefaults => '2', prorettype => 'text',
+  proargtypes => 'name bool bool', proargnames => '{tablespace,pretty,owner}',
   proargdefaults => '{false,true}', prosrc => 'pg_get_tablespace_ddl_name' },
 { oid => '6502', descr => 'get DDL to recreate a database',
-  proname => 'pg_get_database_ddl', prorows => '10', proisstrict => 't',
-  proretset => 't', provolatile => 's', pronargdefaults => '3',
-  prorettype => 'text', proargtypes => 'regdatabase bool bool bool',
+  proname => 'pg_get_database_ddl', prorows => '10', proretset => 't',
+  provolatile => 's', pronargdefaults => '3', prorettype => 'text',
+  proargtypes => 'regdatabase bool bool bool',
   proargnames => '{database,pretty,owner,tablespace}',
   proargdefaults => '{false,true,true}', prosrc => 'pg_get_database_ddl' },
 { oid => '2509',

diff --git a/src/test/modules/test_misc/t/012_ddlutils.pl b/src/test/modules/test_misc/t/012_ddlutils.pl
index e541dfa38d12f09907f47bc9985655f8323e12ae..c4096879922e1d008e184e2d1cf9f8a8ccbb689f 100644 (file)
--- a/src/test/modules/test_misc/t/012_ddlutils.pl
+++ b/src/test/modules/test_misc/t/012_ddlutils.pl
@@ -181,7 +181,10 @@ is($result, '0', 'NULL database returns no rows');
        q{SELECT * FROM pg_get_database_ddl('regression_ddlutils_test', owner => 'invalid')}
 );
 isnt($ret, 0, 'invalid boolean option errors');
-like($stderr, qr/invalid input syntax for type boolean/, 'invalid option error message');
+like(
+       $stderr,
+       qr/invalid input syntax for type boolean/,
+       'invalid option error message');
 
 # Duplicate named argument
 ($ret, $stdout, $stderr) = $node->psql(

diff --git a/src/test/recovery/t/051_effective_wal_level.pl b/src/test/recovery/t/051_effective_wal_level.pl
index c45eddc7383a7f2a960dcfa5ddd9939ba58a8f34..d4bc7f0aa407c139773d48026ea69b008cd5c3b3 100644 (file)
--- a/src/test/recovery/t/051_effective_wal_level.pl
+++ b/src/test/recovery/t/051_effective_wal_level.pl
@@ -76,8 +76,7 @@ ok( $primary->log_contains(
 # Wait for the checkpointer to disable logical decoding.
 wait_for_logical_decoding_disabled($primary);
 test_wal_level($primary, "replica|replica",
-       "logical decoding disabled after repack"
-);
+       "logical decoding disabled after repack");
 
 # Create a new logical slot and check that effective_wal_level must be increased
 # to 'logical'.

diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
index 01f3573e1fd0ce9500b63115a66296a3069d68bf..cb7c2a061934f64b1c8de0c744420a162fdf12ce 100644 (file)
--- a/src/test/ssl/t/001_ssltests.pl
+++ b/src/test/ssl/t/001_ssltests.pl
@@ -885,7 +885,8 @@ $node->connect_fails(
        "$common_connstr user=ssltestuser sslcert=ssl/client-revoked.crt "
          . sslkey('client-revoked.key'),
        "certificate authorization fails with revoked client cert",
-       expected_stderr => qr!SSL error: (ssl[a-z0-9/]*|tls) alert certificate revoked!,
+       expected_stderr =>
+         qr!SSL error: (ssl[a-z0-9/]*|tls) alert certificate revoked!,
        log_like => [
                qr{Client certificate verification failed at depth 0: certificate revoked},
                qr{Failed certificate data \(unverified\): subject "/CN=ssltestuser", serial number \d+, issuer "/CN=Test CA for PostgreSQL SSL regression test client certs"},
@@ -987,7 +988,8 @@ $node->connect_fails(
        "$common_connstr user=ssltestuser sslcert=ssl/client-revoked.crt "
          . sslkey('client-revoked.key'),
        "certificate authorization fails with revoked client cert with server-side CRL directory",
-       expected_stderr => qr!SSL error: (ssl[a-z0-9/]*|tls) alert certificate revoked!,
+       expected_stderr =>
+         qr!SSL error: (ssl[a-z0-9/]*|tls) alert certificate revoked!,
        log_like => [
                qr{Client certificate verification failed at depth 0: certificate revoked},
                qr{Failed certificate data \(unverified\): subject "/CN=ssltestuser", serial number \d+, issuer "/CN=Test CA for PostgreSQL SSL regression test client certs"},
@@ -998,7 +1000,8 @@ $node->connect_fails(
        "$common_connstr user=ssltestuser sslcert=ssl/client-revoked-utf8.crt "
          . sslkey('client-revoked-utf8.key'),
        "certificate authorization fails with revoked UTF-8 client cert with server-side CRL directory",
-       expected_stderr => qr!SSL error: (ssl[a-z0-9/]*|tls) alert certificate revoked!,
+       expected_stderr =>
+         qr!SSL error: (ssl[a-z0-9/]*|tls) alert certificate revoked!,
        log_like => [
                qr{Client certificate verification failed at depth 0: certificate revoked},
                qr{Failed certificate data \(unverified\): subject "/CN=\\xce\\x9f\\xce\\xb4\\xcf\\x85\\xcf\\x83\\xcf\\x83\\xce\\xad\\xce\\xb1\\xcf\\x82", serial number \d+, issuer "/CN=Test CA for PostgreSQL SSL regression test client certs"},

diff --git a/src/test/subscription/t/100_bugs.pl b/src/test/subscription/t/100_bugs.pl
index 31dc63ae8c41355cebf9b46924f61dad2de24e81..075c52f98fd2ec1ecfa1582bedd2f1ef9516253b 100644 (file)
--- a/src/test/subscription/t/100_bugs.pl
+++ b/src/test/subscription/t/100_bugs.pl
@@ -644,8 +644,10 @@ ok( $stderr =~ qr/division by zero/,
 );
 
 # Clean up
-$node_publisher->safe_psql('postgres', "SELECT pg_drop_replication_slot('upsert_slot')");
-$node_publisher->safe_psql('postgres', "DROP PUBLICATION pub_rowfilter_error");
+$node_publisher->safe_psql('postgres',
+       "SELECT pg_drop_replication_slot('upsert_slot')");
+$node_publisher->safe_psql('postgres',
+       "DROP PUBLICATION pub_rowfilter_error");
 $node_publisher->safe_psql('postgres', "DROP TABLE tab_upsert");
 
 $node_publisher->stop('fast');