Commit593badd

Neil Conway

committed

Correct an omission in the syntax error message emitted by EXECUTE INTO

in pl/pgsql.

1 parentfbc4edf commit593baddCopy full SHA for 593badd

File tree

-7

lines changed

-7

lines changed

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* procedural language`
`5`	`5`	`*`
`6`	`6`	`* IDENTIFICATION`
`7`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.73 2005/06/07 02:47:16 neilc Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.74 2005/06/08 00:49:36 neilc Exp $`
`8`	`8`	`*`
`9`	`9`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`10`	`10`	`*`
`@@ -1263,13 +1263,12 @@ stmt_dynexecute : K_EXECUTE lno`
`1263`	`1263`	`new->cmd_type = PLPGSQL_STMT_DYNEXECUTE;`
`1264`	`1264`	`new->lineno =$2;`
`1265`	`1265`	`new->query = expr;`
`1266`		`-`
`1267`	`1266`	`new->rec =NULL;`
`1268`	`1267`	`new->row =NULL;`
`1269`	`1268`
`1270`	`1269`	`/*`
`1271`		`- * If we saw "INTO", look foran additional`
`1272`		`- *row orrecord var.`
	`1270`	`+ * If we saw "INTO", look fora following row`
	`1271`	`+ *var,record var, or list of scalars.`
`1273`	`1272`	`*/`
`1274`	`1273`	`if (endtoken == K_INTO)`
`1275`	`1274`	`{`
`@@ -1293,9 +1292,9 @@ stmt_dynexecute : K_EXECUTE lno`
`1293`	`1292`	`plpgsql_error_lineno =$2;`
`1294`	`1293`	`ereport(ERROR,`
`1295`	`1294`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`1296`		`- errmsg("syntax error at\"%s\"",`
`1297`		`-yytext),`
`1298`		`- errdetail("Expected recordorrow variable.")));`
	`1295`	`+ errmsg("syntax error at\"%s\"", yytext),`
	`1296`	`+ errdetail("Expected record variable, row variable,"`
	`1297`	`+"orlist of scalar variables.")));`
`1299`	`1298`	`}`
`1300`	`1299`	`if (yylex() !=';')`
`1301`	`1300`	`yyerror("syntax error");`

Comments

(0)