From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 25 Aug 2015 18:06:13 +0000 (-0400)
Subject: Further tweak wording of error messages about bad CONTINUE/EXIT statements.
X-Git-Tag: REL9_6_BETA1~1443
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=781ed2bfa35f0a8a7ad1029d3a7d7687c73d86a0;p=thirdparty%2Fpostgresql.git

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

Per discussion, a little more verbosity seems called for.
---

diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
index a1ae1bbf2cd..841a8d61227 100644
--- a/src/pl/plpgsql/src/pl_gram.y
+++ b/src/pl/plpgsql/src/pl_gram.y
@@ -1676,7 +1676,8 @@ stmt_exit		: exit_type opt_label opt_exitcond
 							if (label == NULL)
 								ereport(ERROR,
 										(errcode(ERRCODE_SYNTAX_ERROR),
-										 errmsg("there is no label \"%s\" surrounding this statement",
+										 errmsg("there is no label \"%s\" "
+												"attached to any block or loop enclosing this statement",
 												$2),
 										 parser_errposition(@2)));
 							/* CONTINUE only allows loop labels */
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index c1822aadf0a..83c643847d5 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -2864,7 +2864,7 @@ begin
     end;
 end;
 $$ language plpgsql;
-ERROR:  there is no label "no_such_label" surrounding this statement
+ERROR:  there is no label "no_such_label" attached to any block or loop enclosing this statement
 LINE 5:             continue no_such_label;
                              ^
 -- should fail: no such label
@@ -2877,7 +2877,7 @@ begin
     end;
 end;
 $$ language plpgsql;
-ERROR:  there is no label "no_such_label" surrounding this statement
+ERROR:  there is no label "no_such_label" attached to any block or loop enclosing this statement
 LINE 5:             exit no_such_label;
                          ^
 -- should fail: CONTINUE can't reference the label of a named block