Commit781ed2b

committed

Further tweak wording of error messages about bad CONTINUE/EXIT statements.

Per discussion, a little more verbosity seems called for.

1 parent7b5ef8f commit781ed2bCopy full SHA for 781ed2b

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1676,7 +1676,8 @@ stmt_exit: exit_type opt_label opt_exitcond`
`1676`	`1676`	`if (label ==NULL)`
`1677`	`1677`	`ereport(ERROR,`
`1678`	`1678`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`1679`		`-errmsg("there is no label\"%s\" surrounding this statement",`
	`1679`	`+errmsg("there is no label\"%s\""`
	`1680`	`+"attached to any block or loop enclosing this statement",`
`1680`	`1681`	`$2),`
`1681`	`1682`	`parser_errposition(@2)));`
`1682`	`1683`	`/* CONTINUE only allows loop labels*/`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2864,7 +2864,7 @@ begin`
`2864`	`2864`	`end;`
`2865`	`2865`	`end;`
`2866`	`2866`	`$$ language plpgsql;`
`2867`		`-ERROR: there is no label "no_such_label"surrounding this statement`
	`2867`	`+ERROR: there is no label "no_such_label"attached to any block or loop enclosing this statement`
`2868`	`2868`	`LINE 5: continue no_such_label;`
`2869`	`2869`	`^`
`2870`	`2870`	`-- should fail: no such label`
`@@ -2877,7 +2877,7 @@ begin`
`2877`	`2877`	`end;`
`2878`	`2878`	`end;`
`2879`	`2879`	`$$ language plpgsql;`
`2880`		`-ERROR: there is no label "no_such_label"surrounding this statement`
	`2880`	`+ERROR: there is no label "no_such_label"attached to any block or loop enclosing this statement`
`2881`	`2881`	`LINE 5: exit no_such_label;`
`2882`	`2882`	`^`
`2883`	`2883`	`-- should fail: CONTINUE can't reference the label of a named block`

Comments

(0)