Commite01c6ce

Michael Meskes

committed

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

1 parentd174a4a commite01c6ceCopy full SHA for e01c6ce

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 7 additions & 2 deletions

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));`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.23 2010/03/21 11:56:45 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.24 2010/03/31 08:45:18 meskes Exp $ */`
`2`	`2`
`3`	`3`	`statements: /EMPTY/`
`4`	`4`	`\| statements statement`
`@@ -296,8 +296,13 @@ ECPGCursorStmt: DECLARE cursor_name cursor_options CURSOR opt_hold FOR prepared`
`296`	`296`	`for (ptr = cur; ptr != NULL; ptr = ptr->next)`
`297`	`297`	`{`
`298`	`298`	`if (strcmp($2, ptr->name) == 0)`
	`299`	`+{`
`299`	`300`	`/* re-definition is a bug */`
`300`		`-mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" is already defined", $2);`
	`301`	`+if ($2[0] == ':')`
	`302`	`+ mmerror(PARSE_ERROR, ET_ERROR, "using variable \"%s\" in different declare statements is not supported", $2+1);`
	`303`	`+ else`
	`304`	`+mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" is already defined", $2);`
	`305`	`+}`
`301`	`306`	`}`
`302`	`307`
`303`	`308`	`this = (struct cursor *) mm_alloc(sizeof(struct cursor));`

Comments

(0)