database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-15 19:21:59 +03:00
Code 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:16 +00:00
parent 44fbe20d62
commit 38f5fdb1e9
1 changed files with 34 additions and 7 deletions
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 * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.32 2002/05/01 12:40:22 wieck Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.33 2002/05/21 18:50:16 tgl Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -1346,17 +1346,44 @@ stmt_open : K_OPEN lno cursor_varptr
if (tok != '(') if (tok != '(')
{ {
plpgsql_error_lineno = yylineno; 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 "); 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 = 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 != ')') if (*cp != ')')
{ {
plpgsql_error_lineno = yylineno; plpgsql_error_lineno = yylineno;