@@ -2067,13 +2067,13 @@ end$$ language plpgsql;
20672067select test_variable_storage();
20682068NOTICE: should see this
20692069CONTEXT: SQL statement "SELECT trap_zero_divide(-100)"
2070- PL/pgSQL function "test_variable_storage" line 7 atperform
2070+ PL/pgSQL function "test_variable_storage" line 7 atPERFORM
20712071NOTICE: should see this only if -100 <> 0
20722072CONTEXT: SQL statement "SELECT trap_zero_divide(-100)"
2073- PL/pgSQL function "test_variable_storage" line 7 atperform
2073+ PL/pgSQL function "test_variable_storage" line 7 atPERFORM
20742074NOTICE: should see this only if -100 fits in smallint
20752075CONTEXT: SQL statement "SELECT trap_zero_divide(-100)"
2076- PL/pgSQL function "test_variable_storage" line 7 atperform
2076+ PL/pgSQL function "test_variable_storage" line 7 atPERFORM
20772077 test_variable_storage
20782078-----------------------
20792079 123456789012
@@ -2302,7 +2302,7 @@ end;
23022302$$ language plpgsql;
23032303select raise_test1(5);
23042304ERROR: too many parameters specified for RAISE
2305- CONTEXT: PL/pgSQL function "raise_test1" line 2 atraise
2305+ CONTEXT: PL/pgSQL function "raise_test1" line 2 atRAISE
23062306create function raise_test2(int) returns int as $$
23072307begin
23082308 raise notice 'This message has too few parameters: %, %, %', $1, $1;
@@ -2311,7 +2311,7 @@ end;
23112311$$ language plpgsql;
23122312select raise_test2(10);
23132313ERROR: too few parameters specified for RAISE
2314- CONTEXT: PL/pgSQL function "raise_test2" line 2 atraise
2314+ CONTEXT: PL/pgSQL function "raise_test2" line 2 atRAISE
23152315--
23162316-- reject function definitions that contain malformed SQL queries at
23172317-- compile-time, where possible
@@ -2430,7 +2430,7 @@ ERROR: column "sqlstate" does not exist
24302430LINE 1: SELECT sqlstate
24312431 ^
24322432QUERY: SELECT sqlstate
2433- CONTEXT: PL/pgSQL function "excpt_test1" line 2 atraise
2433+ CONTEXT: PL/pgSQL function "excpt_test1" line 2 atRAISE
24342434create function excpt_test2() returns void as $$
24352435begin
24362436 begin
@@ -2445,7 +2445,7 @@ ERROR: column "sqlstate" does not exist
24452445LINE 1: SELECT sqlstate
24462446 ^
24472447QUERY: SELECT sqlstate
2448- CONTEXT: PL/pgSQL function "excpt_test2" line 4 atraise
2448+ CONTEXT: PL/pgSQL function "excpt_test2" line 4 atRAISE
24492449create function excpt_test3() returns void as $$
24502450begin
24512451 begin
@@ -2922,7 +2922,7 @@ begin
29222922end$$ language plpgsql;
29232923select footest();
29242924ERROR: query returned no rows
2925- CONTEXT: PL/pgSQL function "footest" line 4 atexecute statement
2925+ CONTEXT: PL/pgSQL function "footest" line 4 atEXECUTE statement
29262926create or replace function footest() returns void as $$
29272927declare x record;
29282928begin
@@ -2932,7 +2932,7 @@ begin
29322932end$$ language plpgsql;
29332933select footest();
29342934ERROR: query returned more than one row
2935- CONTEXT: PL/pgSQL function "footest" line 4 atexecute statement
2935+ CONTEXT: PL/pgSQL function "footest" line 4 atEXECUTE statement
29362936drop function footest();
29372937-- test scrollable cursor support
29382938create function sc_test() returns setof integer as $$
@@ -2976,7 +2976,7 @@ $$ language plpgsql;
29762976select * from sc_test(); -- fails because of NO SCROLL specification
29772977ERROR: cursor can only scan forward
29782978HINT: Declare it with SCROLL option to enable backward scan.
2979- CONTEXT: PL/pgSQL function "sc_test" line 6 atfetch
2979+ CONTEXT: PL/pgSQL function "sc_test" line 6 atFETCH
29802980create or replace function sc_test() returns setof integer as $$
29812981declare
29822982 c refcursor;