Commit3c221c3

committed

Fix a couple of places where the plpgsql grammar would produce an unhelpful

'syntax error' message, rather than something that might draw one'sattention to a missing or wrong-type variable declaration. Per recentgripe.

1 parentee33b95 commit3c221c3Copy full SHA for 3c221c3

File tree

+25

-1

lines changed

+25

-1

lines changed

Lines changed: 25 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.114 2008/09/02 20:37:55 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.115 2008/09/10 01:09:45 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -741,6 +741,18 @@ getdiag_target: T_SCALAR`
`741`	`741`	`check_assignable(yylval.scalar);`
`742`	`742`	`$$ = yylval.scalar->dno;`
`743`	`743`	`}`
	`744`	`+\|T_ROW`
	`745`	`+{`
	`746`	`+yyerror("expected an integer variable");`
	`747`	`+}`
	`748`	`+\|T_RECORD`
	`749`	`+{`
	`750`	`+yyerror("expected an integer variable");`
	`751`	`+}`
	`752`	`+\|T_WORD`
	`753`	`+{`
	`754`	`+yyerror("expected an integer variable");`
	`755`	`+}`
`744`	`756`	`;`
`745`	`757`
`746`	`758`
`@@ -1669,6 +1681,18 @@ cursor_variable: T_SCALAR`
`1669`	`1681`	`}`
`1670`	`1682`	`$$ = (PLpgSQL_var *) yylval.scalar;`
`1671`	`1683`	`}`
	`1684`	`+\|T_ROW`
	`1685`	`+{`
	`1686`	`+yyerror("expected a cursor or refcursor variable");`
	`1687`	`+}`
	`1688`	`+\|T_RECORD`
	`1689`	`+{`
	`1690`	`+yyerror("expected a cursor or refcursor variable");`
	`1691`	`+}`
	`1692`	`+\|T_WORD`
	`1693`	`+{`
	`1694`	`+yyerror("expected a cursor or refcursor variable");`
	`1695`	`+}`
`1672`	`1696`	`;`
`1673`	`1697`
`1674`	`1698`	`exception_sect:`

Comments

(0)