database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-08 07:21:33 +03:00
Code

Fix a couple of cases where the plpgsql grammar looked for T_WORD and

Browse Source 
failed to consider the possibility that it would get T_SCALAR, T_RECORD,
or T_ROW instead because the word happens to match a plpgsql variable name.
In particular, give "duplicate declaration" rather than generic "syntax error"
if the same identifier is declared twice in the same block, as per my recent
complaint.  Also behave more sanely when decl_aliasitem or proc_condition or
opt_lblname is coincidentally not T_WORD.  Refactor the related productions a
bit to reduce duplication.

This is a longstanding bug, but it doesn't seem critical enough to
back-patch.
This commit is contained in:
Tom Lane 2009-05-01 23:57:34 +00:00
parent fe1b07a6f9
commit ccc6759dbb
1 changed files with 78 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.123 2009/04/19 21:50:09 tgl Exp $ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.124 2009/05/01 23:57:34 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -144,7 +144,7 @@ static List *read_raise_options(void);
%type <forvariable> for_variable %type <forvariable> for_variable
%type <stmt> for_control %type <stmt> for_control
%type <str> opt_lblname opt_block_label opt_label %type <str> any_identifier any_name opt_block_label opt_label
%type <str> execsql_start %type <str> execsql_start
%type <list> proc_sect proc_stmts stmt_else %type <list> proc_sect proc_stmts stmt_else
@ -331,7 +331,7 @@ decl_stmts : decl_stmts decl_stmt
{ $$ = $1; } { $$ = $1; }
; ;
decl_stmt : '<' '<' opt_lblname '>' '>' decl_stmt : '<' '<' any_name '>' '>'
{ $$ = $3; } { $$ = $3; }
| K_DECLARE | K_DECLARE
{ $$ = NULL; } { $$ = NULL; }
@ -512,12 +512,12 @@ decl_cursor_arg : decl_varname decl_datatype
decl_is_for : K_IS | /* Oracle */ decl_is_for : K_IS | /* Oracle */
K_FOR; /* ANSI */ K_FOR; /* ANSI */
decl_aliasitem : T_WORD decl_aliasitem : any_identifier
{ {
char *name; char *name;
PLpgSQL_nsitem *nsi; PLpgSQL_nsitem *nsi;
plpgsql_convert_ident(yytext, &name, 1); plpgsql_convert_ident($1, &name, 1);
if (name[0] != '$') if (name[0] != '$')
yyerror("only positional parameters can be aliased"); yyerror("only positional parameters can be aliased");
@ -549,8 +549,27 @@ decl_varname : T_WORD
$$.name = name; $$.name = name;
$$.lineno = plpgsql_scanner_lineno(); $$.lineno = plpgsql_scanner_lineno();
} }
| T_SCALAR
{
/*
* Since the scanner is only searching the topmost
* namestack entry, getting T_SCALAR etc can only
* happen if the name is already declared in this
* block.
*/
yyerror("duplicate declaration");
}
| T_ROW
{
yyerror("duplicate declaration");
}
| T_RECORD
{
yyerror("duplicate declaration");
}
; ;
/* XXX this is broken because it doesn't allow for T_SCALAR,T_ROW,T_RECORD */
decl_renname : T_WORD decl_renname : T_WORD
{ {
char *name; char *name;
@ -1752,45 +1771,39 @@ proc_conditions : proc_conditions K_OR proc_condition
} }
; ;
proc_condition : opt_lblname proc_condition : any_name
{ {
$$ = plpgsql_parse_err_condition($1); if (strcmp($1, "sqlstate") != 0)
} {
| T_SCALAR $$ = plpgsql_parse_err_condition($1);
{ }
/* else
* Because we know the special sqlstate variable {
* is at the top of the namestack (see the PLpgSQL_condition *new;
* exception_sect production), the SQLSTATE char *sqlstatestr;
* keyword will always lex as T_SCALAR. This
* might not be true in other parsing contexts!
*/
PLpgSQL_condition *new;
char *sqlstatestr;
if (pg_strcasecmp(yytext, "sqlstate") != 0) /* next token should be a string literal */
yyerror("syntax error"); if (yylex() != T_STRING)
yyerror("syntax error");
sqlstatestr = parse_string_token(yytext);
/* next token should be a string literal */ if (strlen(sqlstatestr) != 5)
if (yylex() != T_STRING) yyerror("invalid SQLSTATE code");
yyerror("syntax error"); if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5)
sqlstatestr = parse_string_token(yytext); yyerror("invalid SQLSTATE code");
if (strlen(sqlstatestr) != 5) new = palloc(sizeof(PLpgSQL_condition));
yyerror("invalid SQLSTATE code"); new->sqlerrstate =
if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5) MAKE_SQLSTATE(sqlstatestr[0],
yyerror("invalid SQLSTATE code"); sqlstatestr[1],
sqlstatestr[2],
sqlstatestr[3],
sqlstatestr[4]);
new->condname = sqlstatestr;
new->next = NULL;
new = palloc(sizeof(PLpgSQL_condition)); $$ = new;
new->sqlerrstate = MAKE_SQLSTATE(sqlstatestr[0], }
sqlstatestr[1],
sqlstatestr[2],
sqlstatestr[3],
sqlstatestr[4]);
new->condname = sqlstatestr;
new->next = NULL;
$$ = new;
} }
; ;
@ -1815,35 +1828,20 @@ opt_block_label :
plpgsql_ns_push(NULL); plpgsql_ns_push(NULL);
$$ = NULL; $$ = NULL;
} }
| '<' '<' opt_lblname '>' '>' | '<' '<' any_name '>' '>'
{ {
plpgsql_ns_push($3); plpgsql_ns_push($3);
$$ = $3; $$ = $3;
} }
; ;
/*
* need all the options because scanner will have tried to resolve as variable
*/
opt_label : opt_label :
{ {
$$ = NULL; $$ = NULL;
} }
| T_WORD | any_identifier
{ {
$$ = check_label(yytext); $$ = check_label($1);
}
| T_SCALAR
{
$$ = check_label(yytext);
}
| T_RECORD
{
$$ = check_label(yytext);
}
| T_ROW
{
$$ = check_label(yytext);
} }
; ;
@ -1853,11 +1851,32 @@ opt_exitcond : ';'
{ $$ = $2; } { $$ = $2; }
; ;
opt_lblname : T_WORD /*
* need all the options because scanner will have tried to resolve as variable
*/
any_identifier : T_WORD
{
$$ = yytext;
}
| T_SCALAR
{
$$ = yytext;
}
| T_RECORD
{
$$ = yytext;
}
| T_ROW
{
$$ = yytext;
}
;
any_name : any_identifier
{ {
char *name; char *name;
plpgsql_convert_ident(yytext, &name, 1); plpgsql_convert_ident($1, &name, 1);
$$ = name; $$ = name;
} }
; ;