From dfb12a985094b95c417de01661bd634ac9f2738b Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Sun, 29 Oct 2000 09:44:58 +0000 Subject: Removed multibyte stuff since client does not know about encoding in the backendFixed quoting bug reported by Sascha Demetrio (sd@b-comp.de). --- src/interfaces/ecpg/lib/execute.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/interfaces/ecpg/lib/execute.c') diff --git a/src/interfaces/ecpg/lib/execute.c b/src/interfaces/ecpg/lib/execute.c index de27637ea76..f1d11105f07 100644 --- a/src/interfaces/ecpg/lib/execute.c +++ b/src/interfaces/ecpg/lib/execute.c @@ -102,6 +102,7 @@ quote_postgres(char *arg, int lineno) return (res); res[ri++] = '\''; + for (i = 0; arg[i]; i++, ri++) { switch (arg[i]) @@ -118,6 +119,7 @@ quote_postgres(char *arg, int lineno) res[ri] = arg[i]; } + res[ri++] = '\''; res[ri] = '\0'; @@ -247,10 +249,17 @@ next_insert(char *text) char *ptr = text; bool string = false; +printf("%s\n", text); for (; *ptr != '\0' && (*ptr != '?' || string); ptr++) - if (*ptr == '\'' && *(ptr - 1) != '\\') - string = string ? false : true; + { + if (*ptr == '\\') /* escape character */ + ptr++; + else + if (*ptr == '\'' ) + string = string ? false : true; + } +printf("%s\n", ptr); return (*ptr == '\0') ? NULL : ptr; } @@ -704,7 +713,6 @@ ECPGexecute(struct statement * stmt) strcpy(newcopy, copiedquery); if ((p = next_insert(newcopy + hostvarl)) == NULL) { - /* * We have an argument but we dont have the matched up string * in the string @@ -995,7 +1003,7 @@ ECPGdo(int lineno, const char *connection_name, char *query,...) * * Copyright (c) 2000, Christof Petig * - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.12 2000/10/02 16:15:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.13 2000/10/29 09:44:58 meskes Exp $ */ PGconn *ECPG_internal_get_connection(char *name); -- cgit v1.2.3