mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-added Tom's patch fixing my setlocale patch. I accidently

Browse Source 
deleted it.
This commit is contained in:
Michael Meskes 2001-10-02 14:08:28 +00:00
parent f02ffdf4bd
commit fecbeedc7e
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/interfaces/ecpg/ChangeLog
View File

@ -1107,5 +1107,10 @@ Mon Okt 1 13:49:40 CEST 2001
- Fixed truncate bug. - Fixed truncate bug.
- Added patch by Christof Petig <christof.petig@wtal.de> to clean up - Added patch by Christof Petig <christof.petig@wtal.de> to clean up
ecpglib. ecpglib.
TUe Okt 2 16:09:26 CEST 2001
- Re-added Tom's patch fixing my setlocale patch. I accidently
deleted it.
- Set ecpg version to 2.9.0. - Set ecpg version to 2.9.0.
- Set library version to 3.3.0. - Set library version to 3.3.0.

22
src/interfaces/ecpg/lib/execute.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.26 2001/10/01 12:02:28 meskes Exp $ */ /* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.27 2001/10/02 14:08:28 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.
@ -1040,23 +1040,26 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
va_list args; va_list args;
struct statement *stmt; struct statement *stmt;
struct connection *con = get_connection(connection_name); struct connection *con = get_connection(connection_name);
bool status = true; bool status;
char *locale; char *oldlocale;
/* Make sure we do NOT honor the locale for numeric input/output */ /* Make sure we do NOT honor the locale for numeric input/output */
/* since the database wants the standard decimal point */ /* since the database wants the standard decimal point */
locale = setlocale(LC_NUMERIC, "C"); oldlocale = strdup(setlocale(LC_NUMERIC, NULL));
setlocale(LC_NUMERIC, "C");
if (!ecpg_init(con, connection_name, lineno)) if (!ecpg_init(con, connection_name, lineno))
{ {
setlocale(LC_NUMERIC, locale); setlocale(LC_NUMERIC, oldlocale);
free(oldlocale);
return (false); return (false);
} }
va_start(args, query); va_start(args, query);
if (create_statement(lineno, con, &stmt, query, args) == false) if (create_statement(lineno, con, &stmt, query, args) == false)
{ {
setlocale(LC_NUMERIC, locale); setlocale(LC_NUMERIC, oldlocale);
free(oldlocale);
return (false); return (false);
} }
va_end(args); va_end(args);
@ -1067,7 +1070,8 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
free_statement(stmt); free_statement(stmt);
ECPGlog("ECPGdo: not connected to %s\n", con->name); ECPGlog("ECPGdo: not connected to %s\n", con->name);
ECPGraise(lineno, ECPG_NOT_CONN, NULL); ECPGraise(lineno, ECPG_NOT_CONN, NULL);
setlocale(LC_NUMERIC, locale); setlocale(LC_NUMERIC, oldlocale);
free(oldlocale);
return false; return false;
} }
@ -1075,7 +1079,9 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
free_statement(stmt); free_statement(stmt);
/* and reset locale value so our application is not affected */ /* and reset locale value so our application is not affected */
setlocale(LC_NUMERIC, locale); setlocale(LC_NUMERIC, oldlocale);
free(oldlocale);
return (status); return (status);
} }