mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-23 19:39:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve plpgsql's error message when a datatype declaration is omitted.

Browse Source 
Per example from Jeff Ross.
This commit is contained in:
Tom Lane 2007-02-19 03:18:51 +00:00
parent b8c3267792
commit 90c301aaa9
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/pl/plpgsql/src/gram.y
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.98 2007/02/08 18:37:14 tgl Exp $ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.99 2007/02/19 03:18:51 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1728,9 +1728,7 @@ read_sql_construct(int until,
{ {
parenlevel--; parenlevel--;
if (parenlevel < 0) if (parenlevel < 0)
ereport(ERROR, yyerror("mismatched parentheses");
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("mismatched parentheses")));
} }
/* /*
* End of function definition is an error, and we don't expect to * End of function definition is an error, and we don't expect to
@ -1739,11 +1737,9 @@ read_sql_construct(int until,
*/ */
if (tok == 0 || tok == ';') if (tok == 0 || tok == ';')
{ {
plpgsql_error_lineno = lno;
if (parenlevel != 0) if (parenlevel != 0)
ereport(ERROR, yyerror("mismatched parentheses");
(errcode(ERRCODE_SYNTAX_ERROR), plpgsql_error_lineno = lno;
errmsg("mismatched parentheses")));
if (isexpression) if (isexpression)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
@ -1811,6 +1807,7 @@ read_datatype(int tok)
{ {
int lno; int lno;
PLpgSQL_dstring ds; PLpgSQL_dstring ds;
char *type_name;
PLpgSQL_type *result; PLpgSQL_type *result;
bool needspace = false; bool needspace = false;
int parenlevel = 0; int parenlevel = 0;
@ -1833,14 +1830,10 @@ read_datatype(int tok)
{ {
if (tok == 0) if (tok == 0)
{ {
plpgsql_error_lineno = lno;
if (parenlevel != 0) if (parenlevel != 0)
ereport(ERROR, yyerror("mismatched parentheses");
(errcode(ERRCODE_SYNTAX_ERROR), else
errmsg("mismatched parentheses"))); yyerror("incomplete datatype declaration");
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("incomplete datatype declaration")));
} }
/* Possible followers for datatype in a declaration */ /* Possible followers for datatype in a declaration */
if (tok == K_NOT || tok == K_ASSIGN || tok == K_DEFAULT) if (tok == K_NOT || tok == K_ASSIGN || tok == K_DEFAULT)
@ -1862,9 +1855,14 @@ read_datatype(int tok)
plpgsql_push_back_token(tok); plpgsql_push_back_token(tok);
type_name = plpgsql_dstring_get(&ds);
if (type_name[0] == '\0')
yyerror("missing datatype declaration");
plpgsql_error_lineno = lno; /* in case of error in parse_datatype */ plpgsql_error_lineno = lno; /* in case of error in parse_datatype */
result = plpgsql_parse_datatype(plpgsql_dstring_get(&ds)); result = plpgsql_parse_datatype(type_name);
plpgsql_dstring_free(&ds); plpgsql_dstring_free(&ds);
@ -1895,21 +1893,11 @@ make_execsql_stmt(const char *sqlstart, int lineno)
if (tok == ';') if (tok == ';')
break; break;
if (tok == 0) if (tok == 0)
{ yyerror("unexpected end of function definition");
plpgsql_error_lineno = plpgsql_scanner_lineno();
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("unexpected end of function definition")));
}
if (tok == K_INTO) if (tok == K_INTO)
{ {
if (have_into) if (have_into)
{ yyerror("INTO specified more than once");
plpgsql_error_lineno = plpgsql_scanner_lineno();
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("INTO specified more than once")));
}
have_into = true; have_into = true;
read_into_target(&rec, &row, &have_strict); read_into_target(&rec, &row, &have_strict);
continue; continue;