Skip to content

P
Postgres FD Implementation
Commit 803d9c39 authored by Michael Meskes's avatar Michael Meskes
Browse files
Options

Changing a test case also changes the output that is expected. 

Float/Long aliasing doesn't work on all architecures.
parent 1d1868d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 157 deletions
src/interfaces/ecpg/test/complex/test2.pgc
View file @ 803d9c39
...@@ -32,11 +32,9 @@ exec sql begin declare section; ...@@ -32,11 +32,9 @@ exec sql begin declare section;
exec sql end declare section; exec sql end declare section;
exec sql char *married = NULL; exec sql char *married = NULL;
exec sql float ind_married; exec sql long ind_married;
exec sql ind children; exec sql ind children;
exec sql var ind_married is long;
char msg[128]; char msg[128];
ECPGdebug(1, stderr); ECPGdebug(1, stderr);
...@@ -73,7 +71,7 @@ exec sql end declare section; ...@@ -73,7 +71,7 @@ exec sql end declare section;
printf(", born %ld", personal.birth.born); printf(", born %ld", personal.birth.born);
if (i->ind_birth.age >= 0) if (i->ind_birth.age >= 0)
printf(", age = %d", personal.birth.age); printf(", age = %d", personal.birth.age);
if ((long)ind_married >= 0) if (ind_married >= 0)
printf(", married %s", married); printf(", married %s", married);
if (ind_children.smallint >= 0) if (ind_children.smallint >= 0)
printf(", children = %d", children.integer); printf(", children = %d", children.integer);
...@@ -103,7 +101,7 @@ exec sql end declare section; ...@@ -103,7 +101,7 @@ exec sql end declare section;
printf(", born %ld", personal.birth.born); printf(", born %ld", personal.birth.born);
if (ind_personal.ind_birth.age >= 0) if (ind_personal.ind_birth.age >= 0)
printf(", age = %d", personal.birth.age); printf(", age = %d", personal.birth.age);
if ((long)ind_married >= 0) if (ind_married >= 0)
printf(", married %s", married); printf(", married %s", married);
if (ind_children.smallint >= 0) if (ind_children.smallint >= 0)
printf(", children = %d", children.integer); printf(", children = %d", children.integer);
......
src/interfaces/ecpg/test/expected/complex-test2.c
View file @ 803d9c39
...@@ -148,7 +148,7 @@ main (void) ...@@ -148,7 +148,7 @@ main (void)
#line 35 "test2.pgc" #line 35 "test2.pgc"
float ind_married ; long ind_married ;
#line 35 "test2.pgc" #line 35 "test2.pgc"
...@@ -159,107 +159,103 @@ main (void) ...@@ -159,107 +159,103 @@ main (void)
#line 36 "test2.pgc" #line 36 "test2.pgc"
/* exec sql var ind_married is long */
#line 38 "test2.pgc"
char msg[128]; char msg[128];
ECPGdebug(1, stderr); ECPGdebug(1, stderr);
strcpy(msg, "connect"); strcpy(msg, "connect");
{ ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0);
#line 45 "test2.pgc" #line 43 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 45 "test2.pgc" #line 43 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 45 "test2.pgc" #line 43 "test2.pgc"
strcpy(msg, "create"); strcpy(msg, "create");
{ ECPGdo(__LINE__, 0, 1, NULL, "create table meskes ( name char ( 8 ) , born integer , age smallint , married date , children integer ) ", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "create table meskes ( name char ( 8 ) , born integer , age smallint , married date , children integer ) ", ECPGt_EOIT, ECPGt_EORT);
#line 48 "test2.pgc" #line 46 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 48 "test2.pgc" #line 46 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 48 "test2.pgc" #line 46 "test2.pgc"
strcpy(msg, "insert"); strcpy(msg, "insert");
{ ECPGdo(__LINE__, 0, 1, NULL, "insert into meskes ( name , married , children ) values( 'Petra' , '19900404' , 3 ) ", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "insert into meskes ( name , married , children ) values ( 'Petra' , '19900404' , 3 ) ", ECPGt_EOIT, ECPGt_EORT);
#line 51 "test2.pgc" #line 49 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 51 "test2.pgc" #line 49 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 51 "test2.pgc" #line 49 "test2.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, "insert into meskes ( name , born , age , married , children ) values( 'Michael' , 19660117 , 35 , '19900404' , 3 ) ", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "insert into meskes ( name , born , age , married , children ) values ( 'Michael' , 19660117 , 35 , '19900404' , 3 ) ", ECPGt_EOIT, ECPGt_EORT);
#line 52 "test2.pgc" #line 50 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 52 "test2.pgc" #line 50 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 52 "test2.pgc" #line 50 "test2.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, "insert into meskes ( name , born , age ) values( 'Carsten' , 19910103 , 10 ) ", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "insert into meskes ( name , born , age ) values ( 'Carsten' , 19910103 , 10 ) ", ECPGt_EOIT, ECPGt_EORT);
#line 53 "test2.pgc" #line 51 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 53 "test2.pgc" #line 51 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 53 "test2.pgc" #line 51 "test2.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, "insert into meskes ( name , born , age ) values( 'Marc' , 19930907 , 8 ) ", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "insert into meskes ( name , born , age ) values ( 'Marc' , 19930907 , 8 ) ", ECPGt_EOIT, ECPGt_EORT);
#line 54 "test2.pgc" #line 52 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 54 "test2.pgc" #line 52 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 54 "test2.pgc" #line 52 "test2.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, "insert into meskes ( name , born , age ) values( 'Chris' , 19970923 , 4 ) ", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "insert into meskes ( name , born , age ) values ( 'Chris' , 19970923 , 4 ) ", ECPGt_EOIT, ECPGt_EORT);
#line 55 "test2.pgc" #line 53 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 55 "test2.pgc" #line 53 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 55 "test2.pgc" #line 53 "test2.pgc"
strcpy(msg, "commit"); strcpy(msg, "commit");
{ ECPGtrans(__LINE__, NULL, "commit"); { ECPGtrans(__LINE__, NULL, "commit");
#line 58 "test2.pgc" #line 56 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 58 "test2.pgc" #line 56 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 58 "test2.pgc" #line 56 "test2.pgc"
strcpy(msg, "open"); strcpy(msg, "open");
{ ECPGdo(__LINE__, 0, 1, NULL, "declare cur cursor for select name , born , age , married , children from meskes ", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "declare cur cursor for select name , born , age , married , children from meskes ", ECPGt_EOIT, ECPGt_EORT);
#line 61 "test2.pgc" #line 59 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 61 "test2.pgc" #line 59 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 61 "test2.pgc" #line 59 "test2.pgc"
/* exec sql whenever not found break ; */ /* exec sql whenever not found break ; */
#line 63 "test2.pgc" #line 61 "test2.pgc"
p=&personal; p=&personal;
...@@ -278,23 +274,23 @@ if (sqlca.sqlcode < 0) Finish ( msg );} ...@@ -278,23 +274,23 @@ if (sqlca.sqlcode < 0) Finish ( msg );}
ECPGt_long,&(ind_married),(long)1,(long)1,sizeof(long), ECPGt_long,&(ind_married),(long)1,(long)1,sizeof(long),
ECPGt_int,&(children.integer),(long)1,(long)1,sizeof(int), ECPGt_int,&(children.integer),(long)1,(long)1,sizeof(int),
ECPGt_short,&(ind_children.smallint),(long)1,(long)1,sizeof(short), ECPGt_EORT); ECPGt_short,&(ind_children.smallint),(long)1,(long)1,sizeof(short), ECPGt_EORT);
#line 70 "test2.pgc" #line 68 "test2.pgc"
if (sqlca.sqlcode == ECPG_NOT_FOUND) break; if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
#line 70 "test2.pgc" #line 68 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 70 "test2.pgc" #line 68 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 70 "test2.pgc" #line 68 "test2.pgc"
printf("%8.8s", personal.name.arr); printf("%8.8s", personal.name.arr);
if (i->ind_birth.born >= 0) if (i->ind_birth.born >= 0)
printf(", born %ld", personal.birth.born); printf(", born %ld", personal.birth.born);
if (i->ind_birth.age >= 0) if (i->ind_birth.age >= 0)
printf(", age = %d", personal.birth.age); printf(", age = %d", personal.birth.age);
if ((long)ind_married >= 0) if (ind_married >= 0)
printf(", married %s", married); printf(", married %s", married);
if (ind_children.smallint >= 0) if (ind_children.smallint >= 0)
printf(", children = %d", children.integer); printf(", children = %d", children.integer);
...@@ -306,27 +302,27 @@ if (sqlca.sqlcode < 0) Finish ( msg );} ...@@ -306,27 +302,27 @@ if (sqlca.sqlcode < 0) Finish ( msg );}
strcpy(msg, "close"); strcpy(msg, "close");
{ ECPGdo(__LINE__, 0, 1, NULL, "close cur", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "close cur", ECPGt_EOIT, ECPGt_EORT);
#line 87 "test2.pgc" #line 85 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 87 "test2.pgc" #line 85 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 87 "test2.pgc" #line 85 "test2.pgc"
/* and now a same query with prepare */ /* and now a same query with prepare */
{ ECPGprepare(__LINE__, "MM" , query); { ECPGprepare(__LINE__, "MM" , query);
#line 90 "test2.pgc" #line 88 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 90 "test2.pgc" #line 88 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 90 "test2.pgc" #line 88 "test2.pgc"
/* declare prep cursor for ? */ /* declare prep cursor for ? */
#line 91 "test2.pgc" #line 89 "test2.pgc"
strcpy(msg, "open"); strcpy(msg, "open");
...@@ -335,17 +331,17 @@ if (sqlca.sqlcode < 0) Finish ( msg );} ...@@ -335,17 +331,17 @@ if (sqlca.sqlcode < 0) Finish ( msg );}
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L,
ECPGt_const,"'Petra'",(long)7,(long)1,strlen("'Petra'"), ECPGt_const,"'Petra'",(long)7,(long)1,strlen("'Petra'"),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
#line 94 "test2.pgc" #line 92 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 94 "test2.pgc" #line 92 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 94 "test2.pgc" #line 92 "test2.pgc"
/* exec sql whenever not found break ; */ /* exec sql whenever not found break ; */
#line 96 "test2.pgc" #line 94 "test2.pgc"
while (1) { while (1) {
...@@ -361,23 +357,23 @@ if (sqlca.sqlcode < 0) Finish ( msg );} ...@@ -361,23 +357,23 @@ if (sqlca.sqlcode < 0) Finish ( msg );}
ECPGt_long,&(ind_married),(long)1,(long)1,sizeof(long), ECPGt_long,&(ind_married),(long)1,(long)1,sizeof(long),
ECPGt_int,&(children.integer),(long)1,(long)1,sizeof(int), ECPGt_int,&(children.integer),(long)1,(long)1,sizeof(int),
ECPGt_short,&(ind_children.smallint),(long)1,(long)1,sizeof(short), ECPGt_EORT); ECPGt_short,&(ind_children.smallint),(long)1,(long)1,sizeof(short), ECPGt_EORT);
#line 100 "test2.pgc" #line 98 "test2.pgc"
if (sqlca.sqlcode == ECPG_NOT_FOUND) break; if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
#line 100 "test2.pgc" #line 98 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 100 "test2.pgc" #line 98 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 100 "test2.pgc" #line 98 "test2.pgc"
printf("%8.8s", personal.name.arr); printf("%8.8s", personal.name.arr);
if (ind_personal.ind_birth.born >= 0) if (ind_personal.ind_birth.born >= 0)
printf(", born %ld", personal.birth.born); printf(", born %ld", personal.birth.born);
if (ind_personal.ind_birth.age >= 0) if (ind_personal.ind_birth.age >= 0)
printf(", age = %d", personal.birth.age); printf(", age = %d", personal.birth.age);
if ((long)ind_married >= 0) if (ind_married >= 0)
printf(", married %s", married); printf(", married %s", married);
if (ind_children.smallint >= 0) if (ind_children.smallint >= 0)
printf(", children = %d", children.integer); printf(", children = %d", children.integer);
...@@ -388,46 +384,46 @@ if (sqlca.sqlcode < 0) Finish ( msg );} ...@@ -388,46 +384,46 @@ if (sqlca.sqlcode < 0) Finish ( msg );}
strcpy(msg, "close"); strcpy(msg, "close");
{ ECPGdo(__LINE__, 0, 1, NULL, "close prep", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "close prep", ECPGt_EOIT, ECPGt_EORT);
#line 116 "test2.pgc" #line 114 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 116 "test2.pgc" #line 114 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 116 "test2.pgc" #line 114 "test2.pgc"
strcpy(msg, "drop"); strcpy(msg, "drop");
{ ECPGdo(__LINE__, 0, 1, NULL, "drop table meskes ", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "drop table meskes ", ECPGt_EOIT, ECPGt_EORT);
#line 119 "test2.pgc" #line 117 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 119 "test2.pgc" #line 117 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 119 "test2.pgc" #line 117 "test2.pgc"
strcpy(msg, "commit"); strcpy(msg, "commit");
{ ECPGtrans(__LINE__, NULL, "commit"); { ECPGtrans(__LINE__, NULL, "commit");
#line 122 "test2.pgc" #line 120 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 122 "test2.pgc" #line 120 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 122 "test2.pgc" #line 120 "test2.pgc"
strcpy(msg, "disconnect"); strcpy(msg, "disconnect");
{ ECPGdisconnect(__LINE__, "CURRENT"); { ECPGdisconnect(__LINE__, "CURRENT");
#line 125 "test2.pgc" #line 123 "test2.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlwarn[0] == 'W') warn ( );
#line 125 "test2.pgc" #line 123 "test2.pgc"
if (sqlca.sqlcode < 0) Finish ( msg );} if (sqlca.sqlcode < 0) Finish ( msg );}
#line 125 "test2.pgc" #line 123 "test2.pgc"
return (0); return (0);
......
src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c
View file @ 803d9c39
...@@ -127,7 +127,8 @@ main(void) ...@@ -127,7 +127,8 @@ main(void)
sprintf(t, "%s %s", dates[i], times[j]); sprintf(t, "%s %s", dates[i], times[j]);
ts1 = PGTYPEStimestamp_from_asc(t, NULL); ts1 = PGTYPEStimestamp_from_asc(t, NULL);
text = PGTYPEStimestamp_to_asc(ts1); text = PGTYPEStimestamp_to_asc(ts1);
printf("TS[%d,%d]: %s\n", if (i != 19 || j != 3) /* timestamp as integer or double differ for this case */
printf("TS[%d,%d]: %s\n",
i, j, errno ? "-" : text); i, j, errno ? "-" : text);
free(text); free(text);
} }
......
src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.stdout
View file @ 803d9c39
...@@ -87,7 +87,6 @@ Date[19]: 0099-01-08 BC (N - F) ...@@ -87,7 +87,6 @@ Date[19]: 0099-01-08 BC (N - F)
TS[19,0]: 0099-01-08 00:04:00 BC TS[19,0]: 0099-01-08 00:04:00 BC
TS[19,1]: 0099-01-08 01:59:00 BC TS[19,1]: 0099-01-08 01:59:00 BC
TS[19,2]: 0099-01-08 13:24:40 BC TS[19,2]: 0099-01-08 13:24:40 BC
TS[19,3]: 0099-01-08 13:24:40.495 BC
interval[0]: @ 1 min interval[0]: @ 1 min
interval[1]: @ 1 day 12 hours 59 mins 10 secs interval[1]: @ 1 day 12 hours 59 mins 10 secs
interval[2]: @ 2 days 12 hours 59 mins 10 secs interval[2]: @ 2 days 12 hours 59 mins 10 secs
......
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