Skip to content

Commit 7abe764

Browse files
committed
Fix regression tests for PL/pgSQL error message changes
1 parent 04fbe29 commit 7abe764

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/test/regress/expected/plpgsql.out

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

0 commit comments

Comments
 (0)