rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed multibyte handling as reported by <harada.toshi@oss.ntt.co.jp>.

This commit is contained in:
Michael Meskes 2007-02-11 15:18:17 +00:00
parent b8188e1e64
commit 153affd058
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/ecpg/ChangeLog
View File

@ -2165,5 +2165,9 @@ Fr 2. Feb 09:53:48 CET 2007
- Cleaned up va_list handling. Hopefully this now works on all archs. - Cleaned up va_list handling. Hopefully this now works on all archs.
- Applied Magnus Hagander's patch to take away some compiler warnings. - Applied Magnus Hagander's patch to take away some compiler warnings.
Su 11. Feb 16:09:31 CET 2007
- Fixed multibyte handling as reported by <harada.toshi@oss.ntt.co.jp>.
- Set ecpg library version to 5.3. - Set ecpg library version to 5.3.
- Set ecpg version to 4.3.1. - Set ecpg version to 4.3.1.

52
src/interfaces/ecpg/ecpglib/execute.c
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.63 2007/02/02 08:58:23 meskes Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.64 2007/02/11 15:18:17 meskes Exp $ */
/* /*
* The aim is to get a simpler inteface to the database routines. * The aim is to get a simpler inteface to the database routines.
@ -38,9 +38,11 @@
static char * static char *
quote_postgres(char *arg, bool quote, int lineno) quote_postgres(char *arg, bool quote, int lineno)
{ {
char *res; char *res;
int i, int error;
ri = 0; size_t length;
size_t escaped_len;
size_t buffer_len;
/* /*
* if quote is false we just need to store things in a descriptor they * if quote is false we just need to store things in a descriptor they
@ -50,29 +52,35 @@ quote_postgres(char *arg, bool quote, int lineno)
return res = ECPGstrdup(arg, lineno); return res = ECPGstrdup(arg, lineno);
else else
{ {
res = (char *) ECPGalloc(2 * strlen(arg) + 3, lineno); length = strlen(arg);
buffer_len = 2 * length + 1;
res = (char *) ECPGalloc(buffer_len + 3, lineno);
if (!res) if (!res)
return (res); return (res);
/* error = 0;
* We don't know if the target database is using escaped_len = PQescapeString(res+1, arg, buffer_len);
* standard_conforming_strings, so we always use E'' strings. if (error)
*/
if (strchr(arg, '\\') != NULL)
res[ri++] = ESCAPE_STRING_SYNTAX;
res[ri++] = '\'';
for (i = 0; arg[i]; i++, ri++)
{ {
if (SQL_STR_DOUBLE(arg[i], true)) ECPGfree(res);
res[ri++] = arg[i]; return NULL;
res[ri] = arg[i]; }
if (length == escaped_len)
{
res[0] = res[escaped_len+1] = '\'';
res[escaped_len+2] = '\0';
}
else
{
/*
* We don't know if the target database is using
* standard_conforming_strings, so we always use E'' strings.
*/
memmove(res+2, res+1, escaped_len);
res[0] = ESCAPE_STRING_SYNTAX;
res[1] = res[escaped_len+2] = '\'';
res[escaped_len+3] = '\0';
} }
res[ri++] = '\'';
res[ri] = '\0';
ECPGfree(arg); ECPGfree(arg);
return res; return res;
} }