mirror of
https://github.com/postgres/postgres.git
synced 2026-07-16 13:12:58 -04:00
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.
This commit is contained in:
parent
3f815dd113
commit
99e44c3181
7 changed files with 46 additions and 40 deletions
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -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'.
|
||||
|
|
|
|||
|
|
@ -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"},
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
Loading…
Reference in a new issue