aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces/ecpg/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/interfaces/ecpg/lib')
-rw-r--r--src/interfaces/ecpg/lib/data.c8
-rw-r--r--src/interfaces/ecpg/lib/execute.c4
2 files changed, 7 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/lib/data.c b/src/interfaces/ecpg/lib/data.c
index 8230564e123..b6cc32b8563 100644
--- a/src/interfaces/ecpg/lib/data.c
+++ b/src/interfaces/ecpg/lib/data.c
@@ -236,12 +236,16 @@ get_data(PGresult *results, int act_tuple, int act_field, int lineno,
{
if (pval[0] == 'f' && pval[1] == '\0')
{
- ((char *) var)[act_tuple] = false;
+ if (offset==sizeof(char)) ((char *) var)[act_tuple] = false;
+ else if (offset==sizeof(int)) ((int *) var)[act_tuple] = false;
+ else ECPGraise(lineno, ECPG_CONVERT_BOOL, "different size");
break;
}
else if (pval[0] == 't' && pval[1] == '\0')
{
- ((char *) var)[act_tuple] = true;
+ if (offset==sizeof(char)) ((char *) var)[act_tuple] = true;
+ else if (offset==sizeof(int)) ((int *) var)[act_tuple] = true;
+ else ECPGraise(lineno, ECPG_CONVERT_BOOL, "different size");
break;
}
else if (pval[0] == '\0' && PQgetisnull(results, act_tuple, act_field))
diff --git a/src/interfaces/ecpg/lib/execute.c b/src/interfaces/ecpg/lib/execute.c
index 9daa97a087f..cd8c29a4570 100644
--- a/src/interfaces/ecpg/lib/execute.c
+++ b/src/interfaces/ecpg/lib/execute.c
@@ -251,7 +251,6 @@ next_insert(char *text)
char *ptr = text;
bool string = false;
-printf("%s\n", text);
for (; *ptr != '\0' && (*ptr != '?' || string); ptr++)
{
if (*ptr == '\\') /* escape character */
@@ -261,7 +260,6 @@ printf("%s\n", text);
string = string ? false : true;
}
-printf("%s\n", ptr);
return (*ptr == '\0') ? NULL : ptr;
}
@@ -1007,7 +1005,7 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
*
* Copyright (c) 2000, Christof Petig <christof.petig@wtal.de>
*
- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.14 2000/11/20 15:56:14 petere Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.15 2000/12/18 11:33:54 meskes Exp $
*/
PGconn *ECPG_internal_get_connection(char *name);