Commit 36b0f673 authored by Michael Meskes's avatar Michael Meskes

*** empty log message ***

parent 7e5e7ab7
...@@ -720,3 +720,9 @@ Mon Nov 22 18:26:34 CET 1999 ...@@ -720,3 +720,9 @@ Mon Nov 22 18:26:34 CET 1999
- Clean up parser. - Clean up parser.
- Set library version to 3.0.6. - Set library version to 3.0.6.
- Set ecpg version to 2.6.10. - Set ecpg version to 2.6.10.
Tue Nov 23 07:59:01 CET 1999
- Ignore locale setting in ECPGdo.
- Set library version to 3.0.7.
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.51 1999/11/22 12:48:46 meskes Exp $ # $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.52 1999/11/23 10:32:16 meskes Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
NAME= ecpg NAME= ecpg
SO_MAJOR_VERSION= 3 SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= 0.6 SO_MINOR_VERSION= 0.7
SRCDIR= @top_srcdir@ SRCDIR= @top_srcdir@
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <locale.h>
#include <libpq-fe.h> #include <libpq-fe.h>
#include <libpq/pqcomm.h> #include <libpq/pqcomm.h>
...@@ -656,7 +657,6 @@ ECPGexecute(struct statement * stmt) ...@@ -656,7 +657,6 @@ ECPGexecute(struct statement * stmt)
} }
else else
{ {
/* sqlca.sqlerrd[2] = 0;*/
var = stmt->outlist; var = stmt->outlist;
switch (PQresultStatus(results)) switch (PQresultStatus(results))
{ {
...@@ -1050,6 +1050,11 @@ ECPGdo(int lineno, const char *connection_name, char *query,...) ...@@ -1050,6 +1050,11 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
struct statement *stmt; struct statement *stmt;
struct connection *con = get_connection(connection_name); struct connection *con = get_connection(connection_name);
bool status; bool status;
char *locale = setlocale(LC_NUMERIC, NULL);
/* Make sure we do NOT honor the locale for numeric input/output */
/* since the database wants teh standard decimal point */
setlocale(LC_NUMERIC, "C");
if (!ecpg_init(con, connection_name, lineno)) if (!ecpg_init(con, connection_name, lineno))
return(false); return(false);
...@@ -1069,6 +1074,9 @@ ECPGdo(int lineno, const char *connection_name, char *query,...) ...@@ -1069,6 +1074,9 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
status = ECPGexecute(stmt); status = ECPGexecute(stmt);
free_statement(stmt); free_statement(stmt);
/* and reser value so our application is not affected */
setlocale(LC_NUMERIC, locale);
return (status); return (status);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment