mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Ian Lance Taylor fixing multiple cursor arguments

Browse Source 
and buffer zero termination.

Jan
This commit is contained in:
Jan Wieck 2001-06-06 18:54:41 +00:00
parent 1173344e74
commit ce62c8b10e
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
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.20 2001/05/31 17:15:40 momjian Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.21 2001/06/06 18:54:41 wieck Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -385,7 +385,8 @@ decl_statement : decl_varname decl_const decl_datatype decl_notnull decl_defval
*cp2++ = '\\'; *cp2++ = '\\';
*cp2++ = *cp1++; *cp2++ = *cp1++;
} }
strcat(buf, "'"); *cp2++ = '\'';
*cp2 = '\0';
curname_def->query = strdup(buf); curname_def->query = strdup(buf);
new->default_val = curname_def; new->default_val = curname_def;
@ -1404,6 +1405,8 @@ stmt_open : K_OPEN lno cursor_varptr
{ {
if ($3->cursor_explicit_argrow >= 0) if ($3->cursor_explicit_argrow >= 0)
{ {
char *cp;
tok = yylex(); tok = yylex();
if (tok != '(') if (tok != '(')
@ -1412,7 +1415,20 @@ stmt_open : K_OPEN lno cursor_varptr
elog(ERROR, "cursor %s has arguments", $3->refname); elog(ERROR, "cursor %s has arguments", $3->refname);
} }
new->argquery = read_sqlstmt(';', ";", "SELECT ("); new->argquery = read_sqlstmt(';', ";", "SELECT ");
/* Remove the trailing right paren,
* because we want "select 1, 2", not
* "select (1, 2)".
*/
cp = new->argquery->query;
cp += strlen(cp);
--cp;
if (*cp != ')')
{
plpgsql_comperrinfo();
elog(ERROR, "missing )");
}
*cp = '\0';
} }
else else
{ {