Give a more precise error message if a variable is re-used as cursor name in ecpg.

Michael Meskes · Michael Meskes · commit e01c6ce712d3 · 2010-03-31T08:45:18.000Z
diff --git a/src/interfaces/ecpg/preproc/ecpg.addons b/src/interfaces/ecpg/preproc/ecpg.addons
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.18 2010/03/23 22:12:06 petere Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.19 2010/03/31 08:45:18 meskes Exp $ */
 ECPG: stmtClosePortalStmt block
 	{
 		if (INFORMIX_MODE)
@@ -306,7 +306,12 @@ ECPG: DeclareCursorStmtDECLAREcursor_namecursor_optionsCURSORopt_holdFORSelectSt
 		for (ptr = cur; ptr != NULL; ptr = ptr->next)
 		{
 			if (strcmp($2, ptr->name) == 0)
-				mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" is already defined", $2);
+			{
+				if ($2[0] == ':')
+                                        mmerror(PARSE_ERROR, ET_ERROR, "using variable \"%s\" in different declare statements is not supported", $2+1);
+                                else
+					mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" is already defined", $2);
+			}
 		}
 
 		this = (struct cursor *) mm_alloc(sizeof(struct cursor));
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.23 2010/03/21 11:56:45 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.24 2010/03/31 08:45:18 meskes Exp $ */
 
 statements: /*EMPTY*/
                 | statements statement
@@ -296,8 +296,13 @@ ECPGCursorStmt:  DECLARE cursor_name cursor_options CURSOR opt_hold FOR prepared
 			for (ptr = cur; ptr != NULL; ptr = ptr->next)
 			{
 				if (strcmp($2, ptr->name) == 0)
+				{
 					/* re-definition is a bug */
-					mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" is already defined", $2);
+					if ($2[0] == ':')
+	                                        mmerror(PARSE_ERROR, ET_ERROR, "using variable \"%s\" in different declare statements is not supported", $2+1);
+        	                        else
+						mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" is already defined", $2);
+				}
 			}
 
 			this = (struct cursor *) mm_alloc(sizeof(struct cursor));

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.18 2010/03/23 22:12:06 petere Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.19 2010/03/31 08:45:18 meskes Exp $ */`
`2`	`2`	`ECPG: stmtClosePortalStmt block`
`3`	`3`	`{`
`4`	`4`	`if (INFORMIX_MODE)`
`@@ -306,7 +306,12 @@ ECPG: DeclareCursorStmtDECLAREcursor_namecursor_optionsCURSORopt_holdFORSelectSt`
`306`	`306`	`for (ptr = cur; ptr != NULL; ptr = ptr->next)`
`307`	`307`	`{`
`308`	`308`	`if (strcmp($2, ptr->name) == 0)`
`309`		`- mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" is already defined", $2);`
	`309`	`+ {`
	`310`	`+ if ($2[0] == ':')`
	`311`	`+ mmerror(PARSE_ERROR, ET_ERROR, "using variable \"%s\" in different declare statements is not supported", $2+1);`
	`312`	`+ else`
	`313`	`+ mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" is already defined", $2);`
	`314`	`+ }`
`310`	`315`	`}`
`311`	`316`
`312`	`317`	`this = (struct cursor *) mm_alloc(sizeof(struct cursor));`