Add a regression test case based on bug #7516.

Given what we now know about the cause of this bug, it seems like it'd
be a real good idea to include it in the plperl regression tests, so as
to catch any platform-specific cases where the code gets misoptimized.
This commit is contained in:
Tom Lane 2012-09-14 11:05:53 -04:00
parent beb850e1d8
commit b8fbbcf37f
2 changed files with 72 additions and 0 deletions

View File

@ -62,3 +62,45 @@ select uses_global();
do language plperl $$ elog(NOTICE, ${^TAINT}); $$;
NOTICE: 0
CONTEXT: PL/Perl anonymous code block
-- test recovery after "die"
create or replace function just_die() returns void language plperl AS $$
die "just die";
$$;
select just_die();
ERROR: just die at line 2.
CONTEXT: PL/Perl function "just_die"
create or replace function die_caller() returns int language plpgsql as $$
BEGIN
BEGIN
PERFORM just_die();
EXCEPTION WHEN OTHERS THEN
RAISE NOTICE 'caught die';
END;
RETURN 1;
END;
$$;
select die_caller();
NOTICE: caught die
die_caller
------------
1
(1 row)
create or replace function indirect_die_caller() returns int language plperl as $$
my $prepared = spi_prepare('SELECT die_caller() AS fx');
my $a = spi_exec_prepared($prepared)->{rows}->[0]->{fx};
my $b = spi_exec_prepared($prepared)->{rows}->[0]->{fx};
return $a + $b;
$$;
select indirect_die_caller();
NOTICE: caught die
CONTEXT: SQL statement "SELECT die_caller() AS fx"
PL/Perl function "indirect_die_caller"
NOTICE: caught die
CONTEXT: SQL statement "SELECT die_caller() AS fx"
PL/Perl function "indirect_die_caller"
indirect_die_caller
---------------------
2
(1 row)

View File

@ -46,3 +46,33 @@ select uses_global();
-- make sure we don't choke on readonly values
do language plperl $$ elog(NOTICE, ${^TAINT}); $$;
-- test recovery after "die"
create or replace function just_die() returns void language plperl AS $$
die "just die";
$$;
select just_die();
create or replace function die_caller() returns int language plpgsql as $$
BEGIN
BEGIN
PERFORM just_die();
EXCEPTION WHEN OTHERS THEN
RAISE NOTICE 'caught die';
END;
RETURN 1;
END;
$$;
select die_caller();
create or replace function indirect_die_caller() returns int language plperl as $$
my $prepared = spi_prepare('SELECT die_caller() AS fx');
my $a = spi_exec_prepared($prepared)->{rows}->[0]->{fx};
my $b = spi_exec_prepared($prepared)->{rows}->[0]->{fx};
return $a + $b;
$$;
select indirect_die_caller();