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

tglsfdc · tglsfdc · commit 3c221c3dae59 · 2008-09-10T01:09:45.000Z
'syntax error' message, rather than something that might draw one's
attention to a missing or wrong-type variable declaration.  Per recent
gripe.
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.114 2008/09/02 20:37:55 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.115 2008/09/10 01:09:45 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -741,6 +741,18 @@ getdiag_target	: T_SCALAR
 						check_assignable(yylval.scalar);
 						$$ = yylval.scalar->dno;
 					}
+				| T_ROW
+					{
+						yyerror("expected an integer variable");
+					}
+				| T_RECORD
+					{
+						yyerror("expected an integer variable");
+					}
+				| T_WORD
+					{
+						yyerror("expected an integer variable");
+					}
 				;
 
 
@@ -1669,6 +1681,18 @@ cursor_variable	: T_SCALAR
 						}
 						$$ = (PLpgSQL_var *) yylval.scalar;
 					}
+				| T_ROW
+					{
+						yyerror("expected a cursor or refcursor variable");
+					}
+				| T_RECORD
+					{
+						yyerror("expected a cursor or refcursor variable");
+					}
+				| T_WORD
+					{
+						yyerror("expected a cursor or refcursor variable");
+					}
 				;
 
 exception_sect	:

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 :`