Skip to content
Snippets Groups Projects
Commit 5454b379 authored by Michael Meskes's avatar Michael Meskes
Browse files

*** empty log message ***

parent c4ef93db
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/interfaces/ecpg/ChangeLog
+ 6
− 0
View file @ 5454b379
...@@ -888,5 +888,11 @@ Thu Mar 30 11:11:13 CEST 2000 ...@@ -888,5 +888,11 @@ Thu Mar 30 11:11:13 CEST 2000
Fri Mar 31 08:25:58 CEST 2000 Fri Mar 31 08:25:58 CEST 2000
- Synced preproc.y with gram.y. - Synced preproc.y with gram.y.
Mon Apr 3 21:20:27 CEST 2000
- Made sure pointers are correctly inserted by libecpg. My thanks go
to Jan Urbanek <jan@urbanek.cz> for findin many bugs before the
release.
- Set library version to 3.1.0. - Set library version to 3.1.0.
- Set ecpg version to 2.7.0. - Set ecpg version to 2.7.0.
src/interfaces/ecpg/lib/execute.c
+ 83
− 38
View file @ 5454b379
...@@ -317,12 +317,17 @@ ECPGexecute(struct statement * stmt) ...@@ -317,12 +317,17 @@ ECPGexecute(struct statement * stmt)
if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno))) if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno)))
return false; return false;
sprintf(mallocedval, "%s", (var->arrsize > 1) ? "'{" : ""); if (var->arrsize > 1)
{
strncpy(mallocedval, "'{", sizeof("'{"));
for (element = 0; element < var->arrsize; element++) for (element = 0; element < var->arrsize; element++)
sprintf(mallocedval + strlen(mallocedval), "%d,", ((short *) var->value)[element]); sprintf(mallocedval + strlen(mallocedval), "%hd,", ((short *) var->value)[element]);
sprintf(mallocedval + strlen(mallocedval) - 1, "%s", (var->arrsize > 1) ? "}'" : ""); strncpy(mallocedval + strlen(mallocedval) - 1, "}'", sizeof("}'"));
}
else
sprintf(mallocedval, "%hd", *((short *) var->value));
tobeinserted = mallocedval; tobeinserted = mallocedval;
break; break;
...@@ -331,12 +336,17 @@ ECPGexecute(struct statement * stmt) ...@@ -331,12 +336,17 @@ ECPGexecute(struct statement * stmt)
if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno))) if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno)))
return false; return false;
sprintf(mallocedval, "%s", (var->arrsize > 1) ? "'{" : ""); if (var->arrsize > 1)
{
strncpy(mallocedval, "'{", sizeof("'{"));
for (element = 0; element < var->arrsize; element++) for (element = 0; element < var->arrsize; element++)
sprintf(mallocedval + strlen(mallocedval), "%d,", ((int *) var->value)[element]); sprintf(mallocedval + strlen(mallocedval), "%d,", ((int *) var->value)[element]);
sprintf(mallocedval + strlen(mallocedval) - 1, "%s", (var->arrsize > 1) ? "}'" : ""); strncpy(mallocedval + strlen(mallocedval) - 1, "}'", sizeof("}'"));
}
else
sprintf(mallocedval, "%d", *((int *) var->value));
tobeinserted = mallocedval; tobeinserted = mallocedval;
break; break;
...@@ -345,12 +355,17 @@ ECPGexecute(struct statement * stmt) ...@@ -345,12 +355,17 @@ ECPGexecute(struct statement * stmt)
if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno))) if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno)))
return false; return false;
sprintf(mallocedval, "%s", (var->arrsize > 1) ? "'{" : ""); if (var->arrsize > 1)
{
strncpy(mallocedval, "'{", sizeof("'{"));
for (element = 0; element < var->arrsize; element++) for (element = 0; element < var->arrsize; element++)
sprintf(mallocedval + strlen(mallocedval), "%d,", ((unsigned short *) var->value)[element]); sprintf(mallocedval + strlen(mallocedval), "%hu,", ((unsigned short *) var->value)[element]);
sprintf(mallocedval + strlen(mallocedval) - 1, "%s", (var->arrsize > 1) ? "}'" : ""); strncpy(mallocedval + strlen(mallocedval) - 1, "}'", sizeof("}'"));
}
else
sprintf(mallocedval, "%hu", *((unsigned short *) var->value));
tobeinserted = mallocedval; tobeinserted = mallocedval;
break; break;
...@@ -359,12 +374,17 @@ ECPGexecute(struct statement * stmt) ...@@ -359,12 +374,17 @@ ECPGexecute(struct statement * stmt)
if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno))) if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno)))
return false; return false;
sprintf(mallocedval, "%s", (var->arrsize > 1) ? "'{" : ""); if (var->arrsize > 1)
{
strncpy(mallocedval, "'{", sizeof("'{"));
for (element = 0; element < var->arrsize; element++) for (element = 0; element < var->arrsize; element++)
sprintf(mallocedval + strlen(mallocedval), "%d,", ((unsigned int *) var->value)[element]); sprintf(mallocedval + strlen(mallocedval), "%u,", ((unsigned int *) var->value)[element]);
sprintf(mallocedval + strlen(mallocedval) - 1, "%s", (var->arrsize > 1) ? "}'" : ""); strncpy(mallocedval + strlen(mallocedval) - 1, "}'", sizeof("}'"));
}
else
sprintf(mallocedval, "%u", *((unsigned int *) var->value));
tobeinserted = mallocedval; tobeinserted = mallocedval;
break; break;
...@@ -372,13 +392,18 @@ ECPGexecute(struct statement * stmt) ...@@ -372,13 +392,18 @@ ECPGexecute(struct statement * stmt)
case ECPGt_long: case ECPGt_long:
if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno))) if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno)))
return false; return false;
sprintf(mallocedval, "%s", (var->arrsize > 1) ? "'{" : "");
for (element = 0; element < var->arrsize; element++) if (var->arrsize > 1)
sprintf(mallocedval + strlen(mallocedval), "%ld,", ((long *) var->value)[element]); {
strncpy(mallocedval, "'{", sizeof("'{"));
for (element = 0; element < var->arrsize; element++)
sprintf(mallocedval + strlen(mallocedval), "%ld,", ((long *) var->value)[element]);
sprintf(mallocedval + strlen(mallocedval) - 1, "%s", (var->arrsize > 1) ? "}'" : ""); strncpy(mallocedval + strlen(mallocedval) - 1, "}'", sizeof("}'"));
}
else
sprintf(mallocedval, "%ld", *((long *) var->value));
tobeinserted = mallocedval; tobeinserted = mallocedval;
break; break;
...@@ -387,12 +412,17 @@ ECPGexecute(struct statement * stmt) ...@@ -387,12 +412,17 @@ ECPGexecute(struct statement * stmt)
if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno))) if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno)))
return false; return false;
sprintf(mallocedval, "%s", (var->arrsize > 1) ? "'{" : ""); if (var->arrsize > 1)
{
strncpy(mallocedval, "'{", sizeof("'{"));
for (element = 0; element < var->arrsize; element++) for (element = 0; element < var->arrsize; element++)
sprintf(mallocedval + strlen(mallocedval), "%ld,", ((unsigned long *) var->value)[element]); sprintf(mallocedval + strlen(mallocedval), "%lu,", ((unsigned long *) var->value)[element]);
sprintf(mallocedval + strlen(mallocedval) - 1, "%s", (var->arrsize > 1) ? "}'" : ""); strncpy(mallocedval + strlen(mallocedval) - 1, "}'", sizeof("}'"));
}
else
sprintf(mallocedval, "%lu", *((unsigned long *) var->value));
tobeinserted = mallocedval; tobeinserted = mallocedval;
break; break;
...@@ -401,12 +431,17 @@ ECPGexecute(struct statement * stmt) ...@@ -401,12 +431,17 @@ ECPGexecute(struct statement * stmt)
if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno))) if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno)))
return false; return false;
sprintf(mallocedval, "%s", (var->arrsize > 1) ? "'{" : ""); if (var->arrsize > 1)
{
strncpy(mallocedval, "'{", sizeof("'{"));
for (element = 0; element < var->arrsize; element++) for (element = 0; element < var->arrsize; element++)
sprintf(mallocedval + strlen(mallocedval), "%.14g,", ((float *) var->value)[element]); sprintf(mallocedval + strlen(mallocedval), "%.14g,", ((float *) var->value)[element]);
sprintf(mallocedval + strlen(mallocedval) - 1, "%s", (var->arrsize > 1) ? "}'" : ""); strncpy(mallocedval + strlen(mallocedval) - 1, "}'", sizeof("}'"));
}
else
sprintf(mallocedval, "%.14g", *((float *) var->value));
tobeinserted = mallocedval; tobeinserted = mallocedval;
break; break;
...@@ -415,12 +450,17 @@ ECPGexecute(struct statement * stmt) ...@@ -415,12 +450,17 @@ ECPGexecute(struct statement * stmt)
if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno))) if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno)))
return false; return false;
sprintf(mallocedval, "%s", (var->arrsize > 1) ? "'{" : ""); if (var->arrsize > 1)
{
strncpy(mallocedval, "'{", sizeof("'{"));
for (element = 0; element < var->arrsize; element++) for (element = 0; element < var->arrsize; element++)
sprintf(mallocedval + strlen(mallocedval), "%.14g,", ((double *) var->value)[element]); sprintf(mallocedval + strlen(mallocedval), "%.14g,", ((double *) var->value)[element]);
sprintf(mallocedval + strlen(mallocedval) - 1, "%s", (var->arrsize > 1) ? "}'" : ""); strncpy(mallocedval + strlen(mallocedval) - 1, "}'", sizeof("}'"));
}
else
sprintf(mallocedval, "%.14g", *((double *) var->value));
tobeinserted = mallocedval; tobeinserted = mallocedval;
break; break;
...@@ -429,12 +469,17 @@ ECPGexecute(struct statement * stmt) ...@@ -429,12 +469,17 @@ ECPGexecute(struct statement * stmt)
if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno))) if (!(mallocedval = ecpg_alloc(var->arrsize * 20, stmt->lineno)))
return false; return false;
sprintf(mallocedval, "%s", (var->arrsize > 1) ? "'{" : ""); if (var->arrsize > 1)
{
strncpy(mallocedval, "'{", sizeof("'{"));
for (element = 0; element < var->arrsize; element++) for (element = 0; element < var->arrsize; element++)
sprintf(mallocedval + strlen(mallocedval), "%c,", (((char *) var->value)[element]) ? 't' : 'f'); sprintf(mallocedval + strlen(mallocedval), "%c,", (((char *) var->value)[element]) ? 't' : 'f');
sprintf(mallocedval + strlen(mallocedval) - 1, "%s", (var->arrsize > 1) ? "}'" : ""); strncpy(mallocedval + strlen(mallocedval) - 1, "}'", sizeof("}'"));
}
else
sprintf(mallocedval, "%c,", (*((char *) var->value)) ? 't' : 'f');
tobeinserted = mallocedval; tobeinserted = mallocedval;
break; break;
...@@ -814,7 +859,7 @@ ECPGdo(int lineno, const char *connection_name, char *query, ...) ...@@ -814,7 +859,7 @@ ECPGdo(int lineno, const char *connection_name, char *query, ...)
* *
* Copyright (c) 2000, Christof Petig <christof.petig@wtal.de> * Copyright (c) 2000, Christof Petig <christof.petig@wtal.de>
* *
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.2 2000/03/17 23:26:31 tgl Exp $ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.3 2000/04/03 19:34:25 meskes Exp $
*/ */
PGconn *ECPG_internal_get_connection(char *name); PGconn *ECPG_internal_get_connection(char *name);
......
src/interfaces/ecpg/test/test4.pgc
+ 4
− 1
View file @ 5454b379
...@@ -8,7 +8,8 @@ int ...@@ -8,7 +8,8 @@ int
main () main ()
{ {
EXEC SQL BEGIN DECLARE SECTION; EXEC SQL BEGIN DECLARE SECTION;
int i = 1; int i = 3;
int *did = &i;
int a[10] = {9,8,7,6,5,4,3,2,1,0}; int a[10] = {9,8,7,6,5,4,3,2,1,0};
double f; double f;
EXEC SQL END DECLARE SECTION; EXEC SQL END DECLARE SECTION;
...@@ -31,6 +32,8 @@ EXEC SQL END DECLARE SECTION; ...@@ -31,6 +32,8 @@ EXEC SQL END DECLARE SECTION;
EXEC SQL INSERT INTO test(f,i,a) VALUES(404.90,1,'{0,1,2,3,4,5,6,7,8,9}'); EXEC SQL INSERT INTO test(f,i,a) VALUES(404.90,1,'{0,1,2,3,4,5,6,7,8,9}');
EXEC SQL INSERT INTO test(f,i,a) VALUES(140787.0,2,:a); EXEC SQL INSERT INTO test(f,i,a) VALUES(140787.0,2,:a);
EXEC SQL INSERT INTO test(f,i,a) VALUES(14.07,:did,:a);
EXEC SQL COMMIT; EXEC SQL COMMIT;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment