index 0bec5a8f2cf977347a691ef18ad66b418b8d4a25..14f32c278fe2113c52621edbceffb692ef690ec9 100644 (file)
* procedural language
*
* 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.
*
@@ -385,7 +385,8 @@ decl_statement : decl_varname decl_const decl_datatype decl_notnull decl_defval
*cp2++ = '\\';
*cp2++ = *cp1++;
}
- strcat(buf, "'");
+ *cp2++ = '\'';
+ *cp2 = '0円';
curname_def->query = strdup(buf);
new->default_val = curname_def;
{
if (3ドル->cursor_explicit_argrow >= 0)
{
+ char *cp;
+
tok = yylex();
if (tok != '(')
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
{