NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4af123a

committed

Fix misleading error message context

Author: Pavel Stehule <pavel.stehule@gmail.com>Reviewed-by: Stepan Neretin <sncfmgg@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/CAFj8pRAw+OkVW=FgMKHKyvY3CgtWy3cWdY7XT+S5TJaTttu=oA@mail.gmail.com

1 parent1b373ae commit4af123aCopy full SHA for 4af123a

File tree

4 files changed

-9

lines changed

src
- backend/executor
  - spi.c
- pl/plpgsql/src/expected
  - plpgsql_record.out
  - plpgsql_varprops.out
- test/regress/expected
  - plpgsql.out

4 files changed

-9

lines changed

`‎src/backend/executor/spi.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2978,7 +2978,7 @@ _SPI_error_callback(void *arg)`
`2978`	`2978`	`switch (carg->mode)`
`2979`	`2979`	`{`
`2980`	`2980`	`caseRAW_PARSE_PLPGSQL_EXPR:`
`2981`		`-errcontext("SQL expression \"%s\"",query);`
	`2981`	`+errcontext("PL/pgSQL expression \"%s\"",query);`
`2982`	`2982`	`break;`
`2983`	`2983`	`caseRAW_PARSE_PLPGSQL_ASSIGN1:`
`2984`	`2984`	`caseRAW_PARSE_PLPGSQL_ASSIGN2:`

`‎src/pl/plpgsql/src/expected/plpgsql_record.out‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ NOTICE: r1.q1 = <NULL>`
`272`	`272`	`NOTICE: r1.q2 = <NULL>`
`273`	`273`	`NOTICE: r1 = <NULL>`
`274`	`274`	`ERROR: record "r1" has no field "nosuchfield"`
`275`		`-CONTEXT:SQL expression "r1.nosuchfield"`
	`275`	`+CONTEXT:PL/pgSQL expression "r1.nosuchfield"`
`276`	`276`	`PL/pgSQL function inline_code_block line 7 at RAISE`
`277`	`277`	`-- records, not so much`
`278`	`278`	`do $$`
`@@ -286,7 +286,7 @@ end$$;`
`286`	`286`	`NOTICE: r1 = <NULL>`
`287`	`287`	`ERROR: record "r1" is not assigned yet`
`288`	`288`	`DETAIL: The tuple structure of a not-yet-assigned record is indeterminate.`
`289`		`-CONTEXT:SQL expression "r1.f1"`
	`289`	`+CONTEXT:PL/pgSQL expression "r1.f1"`
`290`	`290`	`PL/pgSQL function inline_code_block line 5 at RAISE`
`291`	`291`	`-- but OK if you assign first`
`292`	`292`	`do $$`
`@@ -304,7 +304,7 @@ NOTICE: r1.f1 = 1`
`304`	`304`	`NOTICE: r1.f2 = 2`
`305`	`305`	`NOTICE: r1 = (1,2)`
`306`	`306`	`ERROR: record "r1" has no field "nosuchfield"`
`307`		`-CONTEXT:SQL expression "r1.nosuchfield"`
	`307`	`+CONTEXT:PL/pgSQL expression "r1.nosuchfield"`
`308`	`308`	`PL/pgSQL function inline_code_block line 9 at RAISE`
`309`	`309`	`-- check %type with block-qualified variable names`
`310`	`310`	`do $$`
`@@ -598,7 +598,7 @@ create function getf3(x mutable) returns int language plpgsql as`
`598`	`598`	`$$ begin return x.f3; end $$;`
`599`	`599`	`select getf3(null::mutable); -- doesn't work yet`
`600`	`600`	`ERROR: record "x" has no field "f3"`
`601`		`-CONTEXT:SQL expression "x.f3"`
	`601`	`+CONTEXT:PL/pgSQL expression "x.f3"`
`602`	`602`	`PL/pgSQL function getf3(mutable) line 1 at RETURN`
`603`	`603`	`alter table mutable add column f3 int;`
`604`	`604`	`select getf3(null::mutable); -- now it works`

`‎src/pl/plpgsql/src/expected/plpgsql_varprops.out‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ begin`
`76`	`76`	`raise notice 'x = %', x;`
`77`	`77`	`end$$;`
`78`	`78`	`ERROR: division by zero`
`79`		`-CONTEXT:SQL expression "1/0"`
	`79`	`+CONTEXT:PL/pgSQL expression "1/0"`
`80`	`80`	`PL/pgSQL function inline_code_block line 2 during statement block local variable initialization`
`81`	`81`	`do $$`
`82`	`82`	`declare x bigint[] := array[1,3,5];`

`‎src/test/regress/expected/plpgsql.out‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2388,7 +2388,7 @@ begin`
`2388`	`2388`	`end $$ language plpgsql;`
`2389`	`2389`	`select namedparmcursor_test7();`
`2390`	`2390`	`ERROR: division by zero`
`2391`		`-CONTEXT:SQL expression "42/0 AS p1, 77 AS p2"`
	`2391`	`+CONTEXT:PL/pgSQL expression "42/0 AS p1, 77 AS p2"`
`2392`	`2392`	`PL/pgSQL function namedparmcursor_test7() line 6 at OPEN`
`2393`	`2393`	`-- check that line comments work correctly within the argument list`
`2394`	`2394`	`-- (this used to require a special hack in the code; it no longer does,`
`@@ -4563,11 +4563,11 @@ end`
`4563`	`4563`	`$$;`
`4564`	`4564`	`select fail();`
`4565`	`4565`	`ERROR: division by zero`
`4566`		`-CONTEXT:SQL expression "1/0"`
	`4566`	`+CONTEXT:PL/pgSQL expression "1/0"`
`4567`	`4567`	`PL/pgSQL function fail() line 3 at RETURN`
`4568`	`4568`	`select fail();`
`4569`	`4569`	`ERROR: division by zero`
`4570`		`-CONTEXT:SQL expression "1/0"`
	`4570`	`+CONTEXT:PL/pgSQL expression "1/0"`
`4571`	`4571`	`PL/pgSQL function fail() line 3 at RETURN`
`4572`	`4572`	`drop function fail();`
`4573`	`4573`	`-- Test handling of string literals.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4af123a

File tree

4 files changed

4 files changed

`‎src/backend/executor/spi.c‎`

`‎src/pl/plpgsql/src/expected/plpgsql_record.out‎`

`‎src/pl/plpgsql/src/expected/plpgsql_varprops.out‎`

`‎src/test/regress/expected/plpgsql.out‎`

0 commit comments