mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-07 19:47:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Repair OPEN cursor(args), which I broke on 11/29/01 with a change to

Browse Source 
be smarter about parentheses in read_sql_construct().  Sigh.
This commit is contained in:
Tom Lane 2002-05-21 18:50:18 +00:00
parent 490b12d53e
commit ce362bf8be
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
* procedural language
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.29 2001/11/29 22:57:37 tgl Exp $
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.29.2.1 2002/05/21 18:50:18 tgl Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@ -1327,17 +1327,44 @@ stmt_open : K_OPEN lno cursor_varptr
if (tok != '(')
{
plpgsql_error_lineno = yylineno;
elog(ERROR, "cursor %s has arguments", $3->refname);
elog(ERROR, "cursor %s has arguments",
$3->refname);
}
/*
* Push back the '(', else read_sql_stmt
* will complain about unbalanced parens.
*/
plpgsql_push_back_token(tok);
new->argquery = read_sql_stmt("SELECT ");
/* Remove the trailing right paren,
* because we want "select 1, 2", not
* "select (1, 2)".
/*
* Now remove the leading and trailing parens,
* because we want "select 1, 2", not
* "select (1, 2)".
*/
cp = new->argquery->query;
cp += strlen(cp);
--cp;
if (strncmp(cp, "SELECT", 6) != 0)
{
plpgsql_error_lineno = yylineno;
elog(ERROR, "expected 'SELECT (', got '%s' (internal error)",
new->argquery->query);
}
cp += 6;
while (*cp == ' ') /* could be more than 1 space here */
cp++;
if (*cp != '(')
{
plpgsql_error_lineno = yylineno;
elog(ERROR, "expected 'SELECT (', got '%s' (internal error)",
new->argquery->query);
}
*cp = ' ';
cp += strlen(cp) - 1;
if (*cp != ')')
{
plpgsql_error_lineno = yylineno;