Commit81624db

Michael Meskes

committed

Cursor names in the backend are not case-sensitve. This change makes sure that

ecpg also does not regard cursor names as case-sensitive.Thanks to Zoltan Boszormenyi for the patch.

1 parent0b81c7c commit81624dbCopy full SHA for 81624db

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 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.19 2010/03/31 08:45:18 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.20 2010/09/10 10:13:20 meskes Exp $ */`
`2`	`2`	`ECPG: stmtClosePortalStmt block`
`3`	`3`	`{`
`4`	`4`	`if (INFORMIX_MODE)`
`@@ -302,10 +302,11 @@ ECPG: DeclareCursorStmtDECLAREcursor_namecursor_optionsCURSORopt_holdFORSelectSt`
`302`	`302`	`struct cursor ptr, this;`
`303`	`303`	`char *cursor_marker = $2[0] == ':' ? make_str("$0") : mm_strdup($2);`
`304`	`304`	`char comment, c1, *c2;`
	`305`	`+int (* strcmp_fn)(const char , const char ) = ($2[0] == ':' ? strcmp : pg_strcasecmp);`
`305`	`306`
`306`	`307`	`for (ptr = cur; ptr != NULL; ptr = ptr->next)`
`307`	`308`	`{`
`308`		`-if (strcmp($2, ptr->name) == 0)`
	`309`	`+if (strcmp_fn($2, ptr->name) == 0)`
`309`	`310`	`{`
`310`	`311`	`if ($2[0] == ':')`
`311`	`312`	`mmerror(PARSE_ERROR, ET_ERROR, "using variable \"%s\" in different declare statements is not supported", $2+1);`

Lines changed: 3 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.header,v 1.16 2010/05/25 14:32:55 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.17 2010/09/10 10:13:20 meskes Exp $ */`
`2`	`2`
`3`	`3`	`/* Copyright comment */`
`4`	`4`	`%{`
`@@ -386,10 +386,11 @@ add_additional_variables(char *name, bool insert)`
`386`	`386`	`{`
`387`	`387`	`struct cursor *ptr;`
`388`	`388`	`struct arguments *p;`
	`389`	`+int (* strcmp_fn)(const char , const char ) = (name[0] == ':' ? strcmp : pg_strcasecmp);`
`389`	`390`
`390`	`391`	`for (ptr = cur; ptr != NULL; ptr=ptr->next)`
`391`	`392`	`{`
`392`		`-if (strcmp(ptr->name, name) == 0)`
	`393`	`+if (strcmp_fn(ptr->name, name) == 0)`
`393`	`394`	`break;`
`394`	`395`	`}`
`395`	`396`

Lines changed: 3 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.26 2010/05/25 17:28:20 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.27 2010/09/10 10:13:20 meskes Exp $ */`
`2`	`2`
`3`	`3`	`statements: /EMPTY/`
`4`	`4`	`\| statements statement`
`@@ -289,13 +289,14 @@ ECPGCursorStmt: DECLARE cursor_name cursor_options CURSOR opt_hold FOR prepared`
`289`	`289`	`{`
`290`	`290`	`struct cursor ptr, this;`
`291`	`291`	`char *cursor_marker = $2[0] == ':' ? make_str("$0") : mm_strdup($2);`
	`292`	`+int (* strcmp_fn)(const char , const char ) = ($2[0] == ':' ? strcmp : pg_strcasecmp);`
`292`	`293`	`struct variable thisquery = (struct variable )mm_alloc(sizeof(struct variable));`
`293`	`294`	`const char *con = connection ? connection : "NULL";`
`294`	`295`	`char *comment;`
`295`	`296`
`296`	`297`	`for (ptr = cur; ptr != NULL; ptr = ptr->next)`
`297`	`298`	`{`
`298`		`-if (strcmp($2, ptr->name) == 0)`
	`299`	`+if (strcmp_fn($2, ptr->name) == 0)`
`299`	`300`	`{`
`300`	`301`	`/* re-definition is a bug */`
`301`	`302`	`if ($2[0] == ':')`

Comments

(0)