ECPG: Fix searching for quoted cursor names case-sensitively.

Michael Meskes · Michael Meskes · commit 0cedfa766d5e · 2013-11-27T11:15:13.000+01:00
Patch by Böszörményi Zoltán &lt;zb@cybertec.at&gt;
diff --git a/src/interfaces/ecpg/preproc/ecpg.addons b/src/interfaces/ecpg/preproc/ecpg.addons
@@ -296,7 +296,7 @@ ECPG: DeclareCursorStmtDECLAREcursor_namecursor_optionsCURSORopt_holdFORSelectSt
 		struct cursor *ptr, *this;
 		char *cursor_marker = $2[0] == ':' ? mm_strdup("$0") : mm_strdup($2);
 		char *comment, *c1, *c2;
-		int (* strcmp_fn)(const char *, const char *) = ($2[0] == ':' ? strcmp : pg_strcasecmp);
+		int (* strcmp_fn)(const char *, const char *) = (($2[0] == ':' || $2[0] == '"') ? strcmp : pg_strcasecmp);
 
 		for (ptr = cur; ptr != NULL; ptr = ptr->next)
 		{
diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header
@@ -477,7 +477,7 @@ add_additional_variables(char *name, bool insert)
 {
 	struct cursor *ptr;
 	struct arguments *p;
-	int (* strcmp_fn)(const char *, const char *) = (name[0] == ':' ? strcmp : pg_strcasecmp);
+	int (* strcmp_fn)(const char *, const char *) = ((name[0] == ':' || name[0] == '"') ? strcmp : pg_strcasecmp);
 
 	for (ptr = cur; ptr != NULL; ptr=ptr->next)
 	{
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -291,7 +291,7 @@ ECPGCursorStmt:  DECLARE cursor_name cursor_options CURSOR opt_hold FOR prepared
 		{
 			struct cursor *ptr, *this;
 			char *cursor_marker = $2[0] == ':' ? mm_strdup("$0") : mm_strdup($2);
-			int (* strcmp_fn)(const char *, const char *) = ($2[0] == ':' ? strcmp : pg_strcasecmp);
+			int (* strcmp_fn)(const char *, const char *) = (($2[0] == ':' || $2[0] == '"') ? strcmp : pg_strcasecmp);
 			struct variable *thisquery = (struct variable *)mm_alloc(sizeof(struct variable));
 			const char *con = connection ? connection : "NULL";
 			char *comment;

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ ECPG: DeclareCursorStmtDECLAREcursor_namecursor_optionsCURSORopt_holdFORSelectSt`
`296`	`296`	`struct cursor ptr, this;`
`297`	`297`	`char *cursor_marker = $2[0] == ':' ? mm_strdup("$0") : mm_strdup($2);`
`298`	`298`	`char comment, c1, *c2;`
`299`		`- int (* strcmp_fn)(const char , const char ) = ($2[0] == ':' ? strcmp : pg_strcasecmp);`
	`299`	`+ int (* strcmp_fn)(const char , const char ) = (($2[0] == ':' \|\| $2[0] == '"') ? strcmp : pg_strcasecmp);`
`300`	`300`
`301`	`301`	`for (ptr = cur; ptr != NULL; ptr = ptr->next)`
`302`	`302`	`{`
Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ add_additional_variables(char *name, bool insert)`
`477`	`477`	`{`
`478`	`478`	`struct cursor *ptr;`
`479`	`479`	`struct arguments *p;`
`480`		`- int (* strcmp_fn)(const char , const char ) = (name[0] == ':' ? strcmp : pg_strcasecmp);`
	`480`	`+ int (* strcmp_fn)(const char , const char ) = ((name[0] == ':' \|\| name[0] == '"') ? strcmp : pg_strcasecmp);`
`481`	`481`
`482`	`482`	`for (ptr = cur; ptr != NULL; ptr=ptr->next)`
`483`	`483`	`{`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ ECPGCursorStmt: DECLARE cursor_name cursor_options CURSOR opt_hold FOR prepared`
`291`	`291`	`{`
`292`	`292`	`struct cursor ptr, this;`
`293`	`293`	`char *cursor_marker = $2[0] == ':' ? mm_strdup("$0") : mm_strdup($2);`
`294`		`- int (* strcmp_fn)(const char , const char ) = ($2[0] == ':' ? strcmp : pg_strcasecmp);`
	`294`	`+ int (* strcmp_fn)(const char , const char ) = (($2[0] == ':' \|\| $2[0] == '"') ? strcmp : pg_strcasecmp);`
`295`	`295`	`struct variable thisquery = (struct variable )mm_alloc(sizeof(struct variable));`
`296`	`296`	`const char *con = connection ? connection : "NULL";`
`297`	`297`	`char *comment;`