open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix new auto_explain test case for Windows.

Browse Source 
In commit 7c34555f8, I overlooked the need to configure SSPI
on Windows to allow login as the non-superuser role.
Fix that by adding auth_extra/--create-role incantation
(which, oddly enough, doesn't actually create the role).
Per buildfarm.

While here, upgrade the mechanism for temporarily setting
$ENV{PGUSER}, as per recommendation from ilmari.

Discussion: https://postgr.es/m/87edy7j1zz.fsf@wibble.ilmari.org
pull/95/head
Tom Lane 3 years ago
parent 5f858dd3be
commit 5253519b27
1 changed files with 20 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 39
      contrib/auto_explain/t/001_auto_explain.pl

39
contrib/auto_explain/t/001_auto_explain.pl
Unescape View File

@ -28,7 +28,7 @@ sub query_log
} }
my $node = PostgreSQL::Test::Cluster->new('main'); my $node = PostgreSQL::Test::Cluster->new('main');
$node->init; $node->init('auth_extra' => [ '--create-role', 'regress_user1' ]);
$node->append_conf('postgresql.conf', $node->append_conf('postgresql.conf',
"session_preload_libraries = 'auto_explain'"); "session_preload_libraries = 'auto_explain'");
$node->append_conf('postgresql.conf', "auto_explain.log_min_duration = 0"); $node->append_conf('postgresql.conf', "auto_explain.log_min_duration = 0");
@ -152,29 +152,30 @@ CREATE USER regress_user1;
GRANT SET ON PARAMETER auto_explain.log_format TO regress_user1; GRANT SET ON PARAMETER auto_explain.log_format TO regress_user1;
}); });
$ENV{PGUSER} = "regress_user1"; {
local $ENV{PGUSER} = "regress_user1";
$log_contents = query_log( $log_contents = query_log(
$node, $node,
"SELECT * FROM pg_database;", "SELECT * FROM pg_database;",
{ "auto_explain.log_format" => "json" }); { "auto_explain.log_format" => "json" });
like( like(
$log_contents, $log_contents,
qr/"Query Text": "SELECT \* FROM pg_database;"/, qr/"Query Text": "SELECT \* FROM pg_database;"/,
"query text logged, json mode selected by non-superuser"); "query text logged, json mode selected by non-superuser");
$log_contents = query_log( $log_contents = query_log(
$node, $node,
"SELECT * FROM pg_database;", "SELECT * FROM pg_database;",
{ "auto_explain.log_level" => "log" }); { "auto_explain.log_level" => "log" });
like( like(
$log_contents, $log_contents,
qr/WARNING: permission denied to set parameter "auto_explain\.log_level"/, qr/WARNING: permission denied to set parameter "auto_explain\.log_level"/,
"permission failure logged"); "permission failure logged");
$ENV{PGUSER} = undef; } # end queries run as regress_user1
$node->safe_psql( $node->safe_psql(
"postgres", q{ "postgres", q{

Write Preview
Loading…
Cancel
Save