From fcc2fbac22148ed640dff24caef7c57d20bdad06 Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Wed, 4 Oct 2006 10:09:03 +0000 Subject: [PATCH] Reverted changes made by pgindent Made show.pgc set all variables before displaying them. --- .../test/expected/compat_informix-charfuncs.c | 12 +- .../test/expected/compat_informix-dec_test.c | 121 ++--- .../test/expected/compat_informix-rfmtdate.c | 36 +- .../test/expected/compat_informix-rfmtlong.c | 10 +- .../test/expected/compat_informix-rnull.c | 275 +++++----- .../expected/compat_informix-test_informix.c | 220 +++----- .../expected/compat_informix-test_informix2.c | 215 ++++---- .../ecpg/test/expected/connect-test1.c | 129 ++--- .../ecpg/test/expected/connect-test2.c | 75 +-- .../ecpg/test/expected/connect-test3.c | 72 +-- .../ecpg/test/expected/connect-test4.c | 12 +- .../ecpg/test/expected/connect-test5.c | 129 ++--- .../ecpg/test/expected/pgtypeslib-dt_test.c | 259 +++------- .../ecpg/test/expected/pgtypeslib-dt_test2.c | 146 +++--- .../ecpg/test/expected/pgtypeslib-num_test.c | 86 +-- .../ecpg/test/expected/pgtypeslib-num_test2.c | 143 ++--- .../ecpg/test/expected/preproc-comment.c | 23 +- .../ecpg/test/expected/preproc-define.c | 134 ++--- .../ecpg/test/expected/preproc-init.c | 162 +++--- .../ecpg/test/expected/preproc-type.c | 184 +++---- .../ecpg/test/expected/preproc-variable.c | 240 ++++----- .../ecpg/test/expected/preproc-whenever.c | 223 +++----- src/interfaces/ecpg/test/expected/sql-array.c | 197 +++---- .../ecpg/test/expected/sql-binary.c | 217 ++++---- .../ecpg/test/expected/sql-code100.c | 113 ++-- .../ecpg/test/expected/sql-copystdout.c | 64 +-- .../ecpg/test/expected/sql-define.c | 138 ++--- src/interfaces/ecpg/test/expected/sql-desc.c | 375 +++++--------- .../ecpg/test/expected/sql-dynalloc.c | 350 +++++-------- .../ecpg/test/expected/sql-dynalloc2.c | 202 +++----- .../ecpg/test/expected/sql-dyntest.c | 489 ++++++++---------- .../ecpg/test/expected/sql-execute.c | 266 ++++------ src/interfaces/ecpg/test/expected/sql-fetch.c | 190 +++---- src/interfaces/ecpg/test/expected/sql-func.c | 112 ++-- .../ecpg/test/expected/sql-indicators.c | 114 ++-- src/interfaces/ecpg/test/expected/sql-quote.c | 143 ++--- src/interfaces/ecpg/test/expected/sql-show.c | 157 +++--- .../ecpg/test/expected/sql-show.stderr | 36 +- .../ecpg/test/expected/sql-show.stdout | 5 +- .../ecpg/test/expected/sql-update.c | 130 ++--- .../ecpg/test/expected/thread-thread.c | 236 ++++----- .../test/expected/thread-thread_implicit.c | 236 ++++----- src/interfaces/ecpg/test/sql/show.pgc | 10 +- 43 files changed, 2575 insertions(+), 4111 deletions(-) diff --git a/src/interfaces/ecpg/test/expected/compat_informix-charfuncs.c b/src/interfaces/ecpg/test/expected/compat_informix-charfuncs.c index 7ed4de17ed..eddd580e54 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-charfuncs.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-charfuncs.c @@ -13,14 +13,12 @@ #include #include -int -main(void) +int main(void) { - char t1[] = "abc def ghi "; - - /* 123456789012345 */ - char buf[50]; - int k; + char t1[] = "abc def ghi "; + /* 123456789012345 */ + char buf[50]; + int k; printf("t1: _%s_\n", t1); rupshift(t1); diff --git a/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c b/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c index bde792c400..a130aa17c9 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c @@ -44,36 +44,31 @@ TODO: ECPG_INFORMIX_BAD_EXPONENT ? */ -char *decs[] = {"2E394", "-2", ".794", "3.44", "592.49E21", "-32.84e4", - "2E-394", ".1E-2", "+.0", "-592.49E-07", "+32.84e-4", - ".500001", "-.5000001", - "1234567890123456789012345678.91", /* 30 digits should fit into decimal */ - "1234567890123456789012345678.921", /* 31 digits should NOT fit into - * decimal */ - "not a number", -NULL}; +char* decs[] = { "2E394", "-2", ".794", "3.44", "592.49E21", "-32.84e4", + "2E-394", ".1E-2", "+.0", "-592.49E-07", "+32.84e-4", + ".500001", "-.5000001", + "1234567890123456789012345678.91", /* 30 digits should fit + into decimal */ + "1234567890123456789012345678.921", /* 31 digits should NOT + fit into decimal */ + "not a number", + NULL}; static void - check_errno(void); +check_errno(void); #define BUFSIZE 200 int main(void) { - decimal *dec, - *din; - char buf[BUFSIZE]; - long l; - int i, - j, - k, - q, - r, - count = 0; - double dbl; - decimal **decarr = (decimal **) calloc(1, sizeof(decimal)); + decimal *dec, *din; + char buf[BUFSIZE]; + long l; + int i, j, k, q, r, count = 0; + double dbl; + decimal **decarr = (decimal **) calloc(1, sizeof(decimal)); ECPGdebug(1, stderr); @@ -90,62 +85,52 @@ main(void) decarr = realloc(decarr, sizeof(decimal *) * (count + 1)); decarr[count++] = dec; - r = dectoasc(dec, buf, BUFSIZE - 1, -1); - if (r < 0) - check_errno(); + r = dectoasc(dec, buf, BUFSIZE-1, -1); + if (r < 0) check_errno(); printf("dec[%d,1]: r: %d, %s\n", i, r, buf); - r = dectoasc(dec, buf, BUFSIZE - 1, 0); - if (r < 0) - check_errno(); + r = dectoasc(dec, buf, BUFSIZE-1, 0); + if (r < 0) check_errno(); printf("dec[%d,2]: r: %d, %s\n", i, r, buf); - r = dectoasc(dec, buf, BUFSIZE - 1, 1); - if (r < 0) - check_errno(); + r = dectoasc(dec, buf, BUFSIZE-1, 1); + if (r < 0) check_errno(); printf("dec[%d,3]: r: %d, %s\n", i, r, buf); - r = dectoasc(dec, buf, BUFSIZE - 1, 2); - if (r < 0) - check_errno(); + r = dectoasc(dec, buf, BUFSIZE-1, 2); + if (r < 0) check_errno(); printf("dec[%d,4]: r: %d, %s\n", i, r, buf); din = PGTYPESdecimal_new(); - r = dectoasc(din, buf, BUFSIZE - 1, 2); - if (r < 0) - check_errno(); + r = dectoasc(din, buf, BUFSIZE-1, 2); + if (r < 0) check_errno(); printf("dec[%d,5]: r: %d, %s\n", i, r, buf); r = dectolong(dec, &l); - if (r) - check_errno(); - printf("dec[%d,6]: %ld (r: %d)\n", i, r ? 0L : l, r); + if (r) check_errno(); + printf("dec[%d,6]: %ld (r: %d)\n", i, r?0L:l, r); if (r == 0) { r = deccvlong(l, din); - if (r) - check_errno(); - dectoasc(din, buf, BUFSIZE - 1, 2); + if (r) check_errno(); + dectoasc(din, buf, BUFSIZE-1, 2); q = deccmp(dec, din); printf("dec[%d,7]: %s (r: %d - cmp: %d)\n", i, buf, r, q); } r = dectoint(dec, &k); - if (r) - check_errno(); - printf("dec[%d,8]: %d (r: %d)\n", i, r ? 0 : k, r); + if (r) check_errno(); + printf("dec[%d,8]: %d (r: %d)\n", i, r?0:k, r); if (r == 0) { r = deccvint(k, din); - if (r) - check_errno(); - dectoasc(din, buf, BUFSIZE - 1, 2); + if (r) check_errno(); + dectoasc(din, buf, BUFSIZE-1, 2); q = deccmp(dec, din); printf("dec[%d,9]: %s (r: %d - cmp: %d)\n", i, buf, r, q); } r = dectodbl(dec, &dbl); - if (r) - check_errno(); - printf("dec[%d,10]: %g (r: %d)\n", i, r ? 0.0 : dbl, r); + if (r) check_errno(); + printf("dec[%d,10]: %g (r: %d)\n", i, r?0.0:dbl, r); PGTYPESdecimal_free(din); printf("\n"); @@ -156,29 +141,23 @@ main(void) decarr = realloc(decarr, sizeof(decimal *) * (count + 1)); decarr[count++] = dec; - rsetnull(CDECIMALTYPE, (char *) decarr[count - 1]); - printf("dec[%d]: %sNULL\n", count - 1, - risnull(CDECIMALTYPE, (char *) decarr[count - 1]) ? "" : "NOT "); + rsetnull(CDECIMALTYPE, (char *) decarr[count-1]); + printf("dec[%d]: %sNULL\n", count-1, + risnull(CDECIMALTYPE, (char *) decarr[count-1]) ? "" : "NOT "); printf("dec[0]: %sNULL\n", - risnull(CDECIMALTYPE, (char *) decarr[0]) ? "" : "NOT "); + risnull(CDECIMALTYPE, (char *) decarr[0]) ? "" : "NOT "); r = dectoasc(decarr[3], buf, -1, -1); - check_errno(); - printf("dectoasc with len == -1: r: %d\n", r); + check_errno(); printf("dectoasc with len == -1: r: %d\n", r); r = dectoasc(decarr[3], buf, 0, -1); - check_errno(); - printf("dectoasc with len == 0: r: %d\n", r); + check_errno(); printf("dectoasc with len == 0: r: %d\n", r); for (i = 0; i < count; i++) { for (j = 0; j < count; j++) { - decimal a, - s, - m, - d; - int c; - + decimal a, s, m, d; + int c; c = deccmp(decarr[i], decarr[j]); printf("dec[c,%d,%d]: %d\n", i, j, c); @@ -190,7 +169,7 @@ main(void) } else { - dectoasc(&a, buf, BUFSIZE - 1, -1); + dectoasc(&a, buf, BUFSIZE-1, -1); printf("dec[a,%d,%d]: %s\n", i, j, buf); } @@ -202,7 +181,7 @@ main(void) } else { - dectoasc(&s, buf, BUFSIZE - 1, -1); + dectoasc(&s, buf, BUFSIZE-1, -1); printf("dec[s,%d,%d]: %s\n", i, j, buf); } @@ -214,7 +193,7 @@ main(void) } else { - dectoasc(&m, buf, BUFSIZE - 1, -1); + dectoasc(&m, buf, BUFSIZE-1, -1); printf("dec[m,%d,%d]: %s\n", i, j, buf); } @@ -226,7 +205,7 @@ main(void) } else { - dectoasc(&d, buf, BUFSIZE - 1, -1); + dectoasc(&d, buf, BUFSIZE-1, -1); printf("dec[d,%d,%d]: %s\n", i, j, buf); } } @@ -234,7 +213,7 @@ main(void) for (i = 0; i < count; i++) { - dectoasc(decarr[i], buf, BUFSIZE - 1, -1); + dectoasc(decarr[i], buf, BUFSIZE-1, -1); printf("%d: %s\n", i, buf); } @@ -244,7 +223,7 @@ main(void) static void check_errno(void) { - switch (errno) + switch(errno) { case 0: printf("(no errno set) - "); diff --git a/src/interfaces/ecpg/test/expected/compat_informix-rfmtdate.c b/src/interfaces/ecpg/test/expected/compat_informix-rfmtdate.c index 7add41eb8e..49de0b660b 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-rfmtdate.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-rfmtdate.c @@ -21,16 +21,15 @@ static void - check_return(int ret); +check_return(int ret); static void date_test_strdate(char *input) { - static int i; - date d; - int r, - q; - char dbuf[11]; + static int i; + date d; + int r, q; + char dbuf[11]; r = rstrdate(input, &d); printf("r: %d ", r); @@ -52,11 +51,10 @@ date_test_strdate(char *input) static void date_test_defmt(char *fmt, char *input) { - static int i; - char dbuf[11]; - date d; - int q, - r; + static int i; + char dbuf[11]; + date d; + int q, r; r = rdefmtdate(&d, fmt, input); printf("r: %d ", r); @@ -78,9 +76,9 @@ date_test_defmt(char *fmt, char *input) static void date_test_fmt(date d, char *fmt) { - static int i; - char buf[200]; - int r; + static int i; + char buf[200]; + int r; r = rfmtdate(d, fmt, buf); printf("r: %d ", r); @@ -94,10 +92,10 @@ date_test_fmt(date d, char *fmt) int main(void) { - short mdy[3] = {11, 23, 1959}; - char dbuf[11]; - date d; - int r; + short mdy[3] = { 11, 23, 1959 }; + char dbuf[11]; + date d; + int r; ECPGdebug(1, stderr); @@ -166,7 +164,7 @@ main(void) static void check_return(int ret) { - switch (ret) + switch(ret) { case ECPG_INFORMIX_ENOTDMY: printf("(ECPG_INFORMIX_ENOTDMY)"); diff --git a/src/interfaces/ecpg/test/expected/compat_informix-rfmtlong.c b/src/interfaces/ecpg/test/expected/compat_informix-rfmtlong.c index 8c9d76986c..d000054abb 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-rfmtlong.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-rfmtlong.c @@ -21,14 +21,14 @@ static void - check_return(int ret); +check_return(int ret); static void fmtlong(long lng, char *fmt) { - static int i; - int r; - char buf[30]; + static int i; + int r; + char buf[30]; r = rfmtlong(lng, fmt, buf); printf("r: %d ", r); @@ -62,7 +62,7 @@ main(void) static void check_return(int ret) { - switch (ret) + switch(ret) { case ECPG_INFORMIX_ENOTDMY: printf("(ECPG_INFORMIX_ENOTDMY)"); diff --git a/src/interfaces/ecpg/test/expected/compat_informix-rnull.c b/src/interfaces/ecpg/test/expected/compat_informix-rnull.c index 7cfa6a80d1..c1c70df083 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-rnull.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-rnull.c @@ -30,66 +30,65 @@ test_null(int type, char *ptr) printf("null: %d\n", risnull(type, ptr)); } -int -main(void) +int main(void) { - + #line 15 "rnull.pgc" - char c[] = "abc "; + char c [] = "abc " ; #line 15 "rnull.pgc" - + #line 16 "rnull.pgc" - short s = 17; + short s = 17 ; #line 16 "rnull.pgc" - + #line 17 "rnull.pgc" - int i = -74874; + int i = - 74874 ; #line 17 "rnull.pgc" - + #line 18 "rnull.pgc" - bool b = 1; + bool b = 1 ; #line 18 "rnull.pgc" - + #line 19 "rnull.pgc" - float f = 3.71; + float f = 3.71 ; #line 19 "rnull.pgc" - + #line 20 "rnull.pgc" - long l = 487444; + long l = 487444 ; #line 20 "rnull.pgc" - + #line 21 "rnull.pgc" - double dbl = 404.404; + double dbl = 404.404 ; #line 21 "rnull.pgc" - + #line 22 "rnull.pgc" - decimal dec; + decimal dec ; #line 22 "rnull.pgc" - + #line 23 "rnull.pgc" - date dat; + date dat ; #line 23 "rnull.pgc" - + #line 24 "rnull.pgc" - timestamp tmp; + timestamp tmp ; #line 24 "rnull.pgc" @@ -99,65 +98,50 @@ main(void) #line 27 "rnull.pgc" - { - ECPGconnect(__LINE__, 1, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 1, "regress1" , NULL,NULL , NULL, 0); #line 29 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 29 "rnull.pgc" - { - ECPGdo(__LINE__, 1, 0, NULL, "create table test ( id int , c char ( 10 ) , s smallint , i int , b bool , f float , l bigint , dbl double precision , dec decimal , dat date , tmp timestamptz ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 0, NULL, "create table test ( id int , c char ( 10 ) , s smallint , i int , b bool , f float , l bigint , dbl double precision , dec decimal , dat date , tmp timestamptz ) ", ECPGt_EOIT, ECPGt_EORT); #line 33 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 33 "rnull.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 34 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 34 "rnull.pgc" - { - ECPGdo(__LINE__, 1, 0, NULL, "insert into test ( id , c , s , i , b , f , l , dbl ) values( 1 , ? , ? , ? , ? , ? , ? , ? ) ", - ECPGt_char, (c), (long) sizeof("abc "), (long) 1, (sizeof("abc ")) *sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_short, &(s), (long) 1, (long) 1, sizeof(short), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_bool, &(b), (long) 1, (long) 1, sizeof(bool), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_float, &(f), (long) 1, (long) 1, sizeof(float), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_long, &(l), (long) 1, (long) 1, sizeof(long), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_double, &(dbl), (long) 1, (long) 1, sizeof(double), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 0, NULL, "insert into test ( id , c , s , i , b , f , l , dbl ) values ( 1 , ? , ? , ? , ? , ? , ? , ? ) ", + ECPGt_char,(c),(long)sizeof("abc "),(long)1,(sizeof("abc "))*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_short,&(s),(long)1,(long)1,sizeof(short), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_bool,&(b),(long)1,(long)1,sizeof(bool), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_float,&(f),(long)1,(long)1,sizeof(float), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_long,&(l),(long)1,(long)1,sizeof(long), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_double,&(dbl),(long)1,(long)1,sizeof(double), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 38 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 38 "rnull.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 39 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 39 "rnull.pgc" @@ -172,74 +156,65 @@ main(void) rsetnull(CDATETYPE, (char *) &dat); rsetnull(CDTIMETYPE, (char *) &tmp); - { - ECPGdo(__LINE__, 1, 0, NULL, "insert into test ( id , c , s , i , b , f , l , dbl , dec , dat , tmp ) values( 2 , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? ) ", - ECPGt_char, (c), (long) sizeof("abc "), (long) 1, (sizeof("abc ")) *sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_short, &(s), (long) 1, (long) 1, sizeof(short), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_bool, &(b), (long) 1, (long) 1, sizeof(bool), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_float, &(f), (long) 1, (long) 1, sizeof(float), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_long, &(l), (long) 1, (long) 1, sizeof(long), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_double, &(dbl), (long) 1, (long) 1, sizeof(double), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_decimal, &(dec), (long) 1, (long) 1, sizeof(decimal), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_date, &(dat), (long) 1, (long) 1, sizeof(date), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_timestamp, &(tmp), (long) 1, (long) 1, sizeof(timestamp), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 0, NULL, "insert into test ( id , c , s , i , b , f , l , dbl , dec , dat , tmp ) values ( 2 , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? ) ", + ECPGt_char,(c),(long)sizeof("abc "),(long)1,(sizeof("abc "))*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_short,&(s),(long)1,(long)1,sizeof(short), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_bool,&(b),(long)1,(long)1,sizeof(bool), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_float,&(f),(long)1,(long)1,sizeof(float), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_long,&(l),(long)1,(long)1,sizeof(long), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_double,&(dbl),(long)1,(long)1,sizeof(double), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_decimal,&(dec),(long)1,(long)1,sizeof(decimal), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_date,&(dat),(long)1,(long)1,sizeof(date), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_timestamp,&(tmp),(long)1,(long)1,sizeof(timestamp), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 54 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 54 "rnull.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 55 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 55 "rnull.pgc" printf("first select\n"); - { - ECPGdo(__LINE__, 1, 0, NULL, "select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 1 ", ECPGt_EOIT, - ECPGt_char, (c), (long) sizeof("abc "), (long) 1, (sizeof("abc ")) *sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_short, &(s), (long) 1, (long) 1, sizeof(short), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_bool, &(b), (long) 1, (long) 1, sizeof(bool), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_float, &(f), (long) 1, (long) 1, sizeof(float), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_long, &(l), (long) 1, (long) 1, sizeof(long), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_double, &(dbl), (long) 1, (long) 1, sizeof(double), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_decimal, &(dec), (long) 1, (long) 1, sizeof(decimal), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_date, &(dat), (long) 1, (long) 1, sizeof(date), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_timestamp, &(tmp), (long) 1, (long) 1, sizeof(timestamp), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 0, NULL, "select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 1 ", ECPGt_EOIT, + ECPGt_char,(c),(long)sizeof("abc "),(long)1,(sizeof("abc "))*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_short,&(s),(long)1,(long)1,sizeof(short), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_bool,&(b),(long)1,(long)1,sizeof(bool), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_float,&(f),(long)1,(long)1,sizeof(float), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_long,&(l),(long)1,(long)1,sizeof(long), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_double,&(dbl),(long)1,(long)1,sizeof(double), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_decimal,&(dec),(long)1,(long)1,sizeof(decimal), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_date,&(dat),(long)1,(long)1,sizeof(date), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_timestamp,&(tmp),(long)1,(long)1,sizeof(timestamp), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 61 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 61 "rnull.pgc" @@ -256,33 +231,30 @@ main(void) printf("second select\n"); - { - ECPGdo(__LINE__, 1, 0, NULL, "select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 2 ", ECPGt_EOIT, - ECPGt_char, (c), (long) sizeof("abc "), (long) 1, (sizeof("abc ")) *sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_short, &(s), (long) 1, (long) 1, sizeof(short), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_bool, &(b), (long) 1, (long) 1, sizeof(bool), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_float, &(f), (long) 1, (long) 1, sizeof(float), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_long, &(l), (long) 1, (long) 1, sizeof(long), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_double, &(dbl), (long) 1, (long) 1, sizeof(double), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_decimal, &(dec), (long) 1, (long) 1, sizeof(decimal), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_date, &(dat), (long) 1, (long) 1, sizeof(date), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_timestamp, &(tmp), (long) 1, (long) 1, sizeof(timestamp), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 0, NULL, "select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 2 ", ECPGt_EOIT, + ECPGt_char,(c),(long)sizeof("abc "),(long)1,(sizeof("abc "))*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_short,&(s),(long)1,(long)1,sizeof(short), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_bool,&(b),(long)1,(long)1,sizeof(bool), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_float,&(f),(long)1,(long)1,sizeof(float), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_long,&(l),(long)1,(long)1,sizeof(long), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_double,&(dbl),(long)1,(long)1,sizeof(double), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_decimal,&(dec),(long)1,(long)1,sizeof(decimal), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_date,&(dat),(long)1,(long)1,sizeof(date), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_timestamp,&(tmp),(long)1,(long)1,sizeof(timestamp), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 78 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 78 "rnull.pgc" @@ -297,32 +269,23 @@ main(void) test_null(CDATETYPE, (char *) &dat); test_null(CDTIMETYPE, (char *) &tmp); - { - ECPGdo(__LINE__, 1, 0, NULL, "drop table test ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 0, NULL, "drop table test ", ECPGt_EOIT, ECPGt_EORT); #line 91 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 91 "rnull.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 92 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 92 "rnull.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); + { ECPGdisconnect(__LINE__, "CURRENT"); #line 94 "rnull.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 94 "rnull.pgc" diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c b/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c index 166a15c5f0..dd58262d68 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c @@ -25,199 +25,149 @@ static void openit(void); -static void -dosqlprint(void) -{ +static void dosqlprint(void) { printf("doSQLprint: Error: %s\n", sqlca.sqlerrm.sqlerrmc); } -int -main(void) +int main(void) { - + #line 14 "test_informix.pgc" - int i = 14; + int i = 14 ; #line 14 "test_informix.pgc" - - + + #line 15 "test_informix.pgc" - decimal j, - m, - n; + decimal j , m , n ; #line 15 "test_informix.pgc" ECPGdebug(1, stderr); - /* exec sql whenever sqlerror do dosqlprint ( ) ; */ + /* exec sql whenever sqlerror do dosqlprint ( ) ; */ #line 18 "test_informix.pgc" - { - ECPGconnect(__LINE__, 1, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 1, "regress1" , NULL,NULL , NULL, 0); #line 20 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 20 "test_informix.pgc" - if (sqlca.sqlcode != 0) - exit(1); + if (sqlca.sqlcode != 0) exit(1); - { - ECPGdo(__LINE__, 1, 1, NULL, "create table test ( i int primary key , j int ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "create table test ( i int primary key , j int ) ", ECPGt_EOIT, ECPGt_EORT); #line 23 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 23 "test_informix.pgc" /* this INSERT works */ - rsetnull(CDECIMALTYPE, (char *) &j); - { - ECPGdo(__LINE__, 1, 1, NULL, "insert into test ( i , j ) values( 7 , ? ) ", - ECPGt_decimal, &(j), (long) 1, (long) 1, sizeof(decimal), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + rsetnull(CDECIMALTYPE, (char *)&j); + { ECPGdo(__LINE__, 1, 1, NULL, "insert into test ( i , j ) values ( 7 , ? ) ", + ECPGt_decimal,&(j),(long)1,(long)1,sizeof(decimal), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 27 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 27 "test_informix.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 28 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 28 "test_informix.pgc" /* this INSERT should fail because i is a unique column */ - { - ECPGdo(__LINE__, 1, 1, NULL, "insert into test ( i , j ) values( 7 , 12 ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "insert into test ( i , j ) values ( 7 , 12 ) ", ECPGt_EOIT, ECPGt_EORT); #line 31 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 31 "test_informix.pgc" printf("INSERT: %ld=%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); - if (sqlca.sqlcode != 0) - { - ECPGtrans(__LINE__, NULL, "rollback"); + if (sqlca.sqlcode != 0) { ECPGtrans(__LINE__, NULL, "rollback"); #line 33 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 33 "test_informix.pgc" - { - ECPGdo(__LINE__, 1, 1, NULL, "insert into test ( i , j ) values( ? , 1 ) ", - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "insert into test ( i , j ) values ( ? , 1 ) ", + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 35 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 35 "test_informix.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 36 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 36 "test_informix.pgc" /* this will fail (more than one row in subquery) */ - { - ECPGdo(__LINE__, 1, 1, NULL, "select i from test where j = ( select j from test ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "select i from test where j = ( select j from test ) ", ECPGt_EOIT, ECPGt_EORT); #line 39 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 39 "test_informix.pgc" - { - ECPGtrans(__LINE__, NULL, "rollback"); + { ECPGtrans(__LINE__, NULL, "rollback"); #line 40 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 40 "test_informix.pgc" /* this however should be ok */ - { - ECPGdo(__LINE__, 1, 1, NULL, "select i from test where j = ( select j from test order by i limit 1 ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "select i from test where j = ( select j from test order by i limit 1 ) ", ECPGt_EOIT, ECPGt_EORT); #line 43 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 43 "test_informix.pgc" printf("SELECT: %ld=%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); - if (sqlca.sqlcode != 0) - { - ECPGtrans(__LINE__, NULL, "rollback"); + if (sqlca.sqlcode != 0) { ECPGtrans(__LINE__, NULL, "rollback"); #line 45 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 45 "test_informix.pgc" - ECPG_informix_set_var(0, &(i), __LINE__); - \ - /* declare c cursor for select * from test where i <= ? */ + ECPG_informix_set_var( 0, &( i ), __LINE__);\ + /* declare c cursor for select * from test where i <= ? */ #line 47 "test_informix.pgc" - openit(); + openit(); deccvint(0, &j); while (1) { - { - ECPGdo(__LINE__, 1, 1, NULL, "fetch forward from c", ECPGt_EOIT, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_decimal, &(j), (long) 1, (long) 1, sizeof(decimal), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "fetch forward from c", ECPGt_EOIT, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_decimal,&(j),(long)1,(long)1,sizeof(decimal), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 54 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 54 "test_informix.pgc" - if (sqlca.sqlcode == 100) - break; - else if (sqlca.sqlcode != 0) - printf("Error: %ld\n", sqlca.sqlcode); + if (sqlca.sqlcode == 100) break; + else if (sqlca.sqlcode != 0) printf ("Error: %ld\n", sqlca.sqlcode); - if (risnull(CDECIMALTYPE, (char *) &j)) + if (risnull(CDECIMALTYPE, (char *)&j)) printf("%d NULL\n", i); else { - int a; + int a; dectoint(&j, &a); printf("%d %d\n", i, a); @@ -227,94 +177,70 @@ main(void) deccvint(7, &j); deccvint(14, &m); decadd(&j, &m, &n); - { - ECPGdo(__LINE__, 1, 1, NULL, "delete from test where i = ? ", - ECPGt_decimal, &(n), (long) 1, (long) 1, sizeof(decimal), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "delete from test where i = ? ", + ECPGt_decimal,&(n),(long)1,(long)1,sizeof(decimal), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 72 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 72 "test_informix.pgc" printf("DELETE: %ld\n", sqlca.sqlcode); - { - ECPGdo(__LINE__, 1, 1, NULL, "select 1 from test where i = 14 ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "select 1 from test where i = 14 ", ECPGt_EOIT, ECPGt_EORT); #line 75 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 75 "test_informix.pgc" printf("Exists: %ld\n", sqlca.sqlcode); - { - ECPGdo(__LINE__, 1, 1, NULL, "select 1 from test where i = 147 ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "select 1 from test where i = 147 ", ECPGt_EOIT, ECPGt_EORT); #line 78 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 78 "test_informix.pgc" printf("Does not exist: %ld\n", sqlca.sqlcode); - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 81 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 81 "test_informix.pgc" - { - ECPGdo(__LINE__, 1, 1, NULL, "drop table test ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "drop table test ", ECPGt_EOIT, ECPGt_EORT); #line 82 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 82 "test_informix.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 83 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 83 "test_informix.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); + { ECPGdisconnect(__LINE__, "CURRENT"); #line 85 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 85 "test_informix.pgc" return 0; } -static void -openit(void) +static void openit(void) { - { - ECPGdo(__LINE__, 1, 1, NULL, "declare c cursor for select * from test where i <= ? ", - ECPGt_int, &(*(int *) (ECPG_informix_get_var(0))), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "declare c cursor for select * from test where i <= ? ", + ECPGt_int,&(*( int *)(ECPG_informix_get_var( 0))),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 92 "test_informix.pgc" - if (sqlca.sqlcode < 0) - dosqlprint(); - } +if (sqlca.sqlcode < 0) dosqlprint ( );} #line 92 "test_informix.pgc" } + diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c index 7926d78251..979c08ff39 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c @@ -79,6 +79,7 @@ struct sqlca_t *ECPGget_sqlca(void); #ifdef __cplusplus } #endif + #endif #line 5 "test_informix2.pgc" @@ -96,79 +97,72 @@ struct sqlca_t *ECPGget_sqlca(void); /* Check SQLCODE, and produce a "standard error" if it's wrong! */ -static void -sql_check(char *fn, char *caller, int ignore) +static void sql_check(char *fn, char *caller, int ignore) { - char errorstring[255]; - - if (SQLCODE == ignore) - return; - else - { - if (SQLCODE != 0) - { - - sprintf(errorstring, "**SQL error %ld doing '%s' in function '%s'. [%s]", - SQLCODE, caller, fn, sqlca.sqlerrm.sqlerrmc); - fprintf(stderr, "%s", errorstring); - printf("%s\n", errorstring); - - /* attempt a ROLLBACK */ - { - ECPGtrans(__LINE__, NULL, "rollback"); - } + char errorstring[255]; + + if (SQLCODE == ignore) + return; + else + { + if (SQLCODE != 0) + { + + sprintf(errorstring, "**SQL error %ld doing '%s' in function '%s'. [%s]", + SQLCODE, caller, fn, sqlca.sqlerrm.sqlerrmc); + fprintf(stderr, "%s", errorstring); + printf("%s\n", errorstring); + + /* attempt a ROLLBACK */ + { ECPGtrans(__LINE__, NULL, "rollback");} #line 27 "test_informix2.pgc" - if (SQLCODE == 0) - { - sprintf(errorstring, "Rollback successful.\n"); - } - else - { - sprintf(errorstring, "Rollback failed with code %ld.\n", SQLCODE); - } + if (SQLCODE == 0) + { + sprintf(errorstring, "Rollback successful.\n"); + } else { + sprintf(errorstring, "Rollback failed with code %ld.\n", SQLCODE); + } - fprintf(stderr, "%s", errorstring); - printf("%s\n", errorstring); + fprintf(stderr, "%s", errorstring); + printf("%s\n", errorstring); - exit(1); - } - } + exit(1); + } + } } -int -main(void) +int main(void) { /* exec sql begin declare section */ - - - - - - + + + + + + #line 49 "test_informix2.pgc" - int c; - + int c ; + #line 50 "test_informix2.pgc" - timestamp d; - + timestamp d ; + #line 51 "test_informix2.pgc" - timestamp e; - + timestamp e ; + #line 52 "test_informix2.pgc" - timestamp maxd; - + timestamp maxd ; + #line 53 "test_informix2.pgc" - char dbname[30]; - + char dbname [ 30 ] ; /* exec sql end declare section */ #line 54 "test_informix2.pgc" - interval *intvl; + interval *intvl; /* exec sql whenever sqlerror sqlprint ; */ #line 58 "test_informix2.pgc" @@ -177,75 +171,57 @@ main(void) ECPGdebug(1, stderr); strcpy(dbname, "regress1"); - { - ECPGconnect(__LINE__, 1, dbname, NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 1, dbname , NULL,NULL , NULL, 0); #line 63 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 63 "test_informix2.pgc" sql_check("main", "connect", 0); - { - ECPGdo(__LINE__, 1, 1, NULL, "set DateStyle to 'DMY'", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "set DateStyle to 'DMY'", ECPGt_EOIT, ECPGt_EORT); #line 66 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 66 "test_informix2.pgc" - { - ECPGdo(__LINE__, 1, 1, NULL, "create table history ( customerid integer , timestamp timestamp without time zone , action_taken char ( 5 ) , narrative varchar ( 100 ) ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "create table history ( customerid integer , timestamp timestamp without time zone , action_taken char ( 5 ) , narrative varchar ( 100 ) ) ", ECPGt_EOIT, ECPGt_EORT); #line 68 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 68 "test_informix2.pgc" sql_check("main", "create", 0); - - { - ECPGdo(__LINE__, 1, 1, NULL, "insert into history ( customerid , timestamp , action_taken , narrative ) values( 1 , '2003-05-07 13:28:34 CEST' , 'test' , 'test' ) ", ECPGt_EOIT, ECPGt_EORT); + + { ECPGdo(__LINE__, 1, 1, NULL, "insert into history ( customerid , timestamp , action_taken , narrative ) values ( 1 , '2003-05-07 13:28:34 CEST' , 'test' , 'test' ) ", ECPGt_EOIT, ECPGt_EORT); #line 73 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 73 "test_informix2.pgc" sql_check("main", "insert", 0); - { - ECPGdo(__LINE__, 1, 1, NULL, "select max ( timestamp ) from history ", ECPGt_EOIT, - ECPGt_timestamp, &(maxd), (long) 1, (long) 1, sizeof(timestamp), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "select max ( timestamp ) from history ", ECPGt_EOIT, + ECPGt_timestamp,&(maxd),(long)1,(long)1,sizeof(timestamp), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 78 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 78 "test_informix2.pgc" sql_check("main", "select max", 100); - { - ECPGdo(__LINE__, 1, 1, NULL, "select customerid , timestamp from history where timestamp = ? limit 1 ", - ECPGt_timestamp, &(maxd), (long) 1, (long) 1, sizeof(timestamp), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, - ECPGt_int, &(c), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_timestamp, &(d), (long) 1, (long) 1, sizeof(timestamp), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "select customerid , timestamp from history where timestamp = ? limit 1 ", + ECPGt_timestamp,&(maxd),(long)1,(long)1,sizeof(timestamp), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, + ECPGt_int,&(c),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_timestamp,&(d),(long)1,(long)1,sizeof(timestamp), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 85 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 85 "test_informix2.pgc" sql_check("main", "select", 0); @@ -257,59 +233,44 @@ main(void) c++; - { - ECPGdo(__LINE__, 1, 1, NULL, "insert into history ( customerid , timestamp , action_taken , narrative ) values( ? , ? , 'test' , 'test' ) ", - ECPGt_int, &(c), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_timestamp, &(e), (long) 1, (long) 1, sizeof(timestamp), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "insert into history ( customerid , timestamp , action_taken , narrative ) values ( ? , ? , 'test' , 'test' ) ", + ECPGt_int,&(c),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_timestamp,&(e),(long)1,(long)1,sizeof(timestamp), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 97 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 97 "test_informix2.pgc" sql_check("main", "update", 0); - - { - ECPGtrans(__LINE__, NULL, "commit"); + + { ECPGtrans(__LINE__, NULL, "commit"); #line 100 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 100 "test_informix2.pgc" - { - ECPGdo(__LINE__, 1, 1, NULL, "drop table history ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 1, 1, NULL, "drop table history ", ECPGt_EOIT, ECPGt_EORT); #line 102 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 102 "test_informix2.pgc" sql_check("main", "drop", 0); - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 105 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 105 "test_informix2.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); + { ECPGdisconnect(__LINE__, "CURRENT"); #line 107 "test_informix2.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 107 "test_informix2.pgc" sql_check("main", "disconnect", 0); @@ -319,13 +280,13 @@ main(void) exit(0); /* - Table "public.history" - Column | Type | Modifiers + Table "public.history" + Column | Type | Modifiers --------------+-----------------------------+----------- - customerid | integer | not null - timestamp | timestamp without time zone | not null - action_taken | character(5) | not null - narrative | character varying(100) | + customerid | integer | not null + timestamp | timestamp without time zone | not null + action_taken | character(5) | not null + narrative | character varying(100) | */ } diff --git a/src/interfaces/ecpg/test/expected/connect-test1.c b/src/interfaces/ecpg/test/expected/connect-test1.c index 59a3b73997..86f3d8d1d3 100644 --- a/src/interfaces/ecpg/test/expected/connect-test1.c +++ b/src/interfaces/ecpg/test/expected/connect-test1.c @@ -25,184 +25,125 @@ int main(void) { /* exec sql begin declare section */ - - + + #line 16 "test1.pgc" - char db[200]; - + char db [ 200 ] ; + #line 17 "test1.pgc" - char pw[200]; - + char pw [ 200 ] ; /* exec sql end declare section */ #line 18 "test1.pgc" ECPGdebug(1, stderr); - { - ECPGconnect(__LINE__, 0, "connectdb", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "main", 0); } #line 22 "test1.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);} #line 23 "test1.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 24 "test1.pgc" - /* <-- "main" not specified */ + /* <-- "main" not specified */ - { - ECPGconnect(__LINE__, 0, "connectdb@localhost", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb@localhost" , NULL,NULL , "main", 0); } #line 26 "test1.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 27 "test1.pgc" - { - ECPGconnect(__LINE__, 0, "@localhost", "connectdb", NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "@localhost" , "connectdb" , NULL , "main", 0); } #line 29 "test1.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 30 "test1.pgc" - { - ECPGconnect(__LINE__, 0, "connectdb@localhost:55432", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb@localhost:55432" , NULL,NULL , "main", 0); } #line 32 "test1.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 33 "test1.pgc" - { - ECPGconnect(__LINE__, 0, "@localhost:55432", "connectdb", NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "@localhost:55432" , "connectdb" , NULL , "main", 0); } #line 35 "test1.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 36 "test1.pgc" - { - ECPGconnect(__LINE__, 0, "connectdb:55432", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb:55432" , NULL,NULL , "main", 0); } #line 38 "test1.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 39 "test1.pgc" - { - ECPGconnect(__LINE__, 0, ":55432", "connectdb", NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, ":55432" , "connectdb" , NULL , "main", 0); } #line 41 "test1.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 42 "test1.pgc" - { - ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost:55432/connectdb", "connectuser", "connectpw", NULL, 0); - } + { ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost:55432/connectdb" , "connectuser" , "connectpw" , NULL, 0); } #line 44 "test1.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 45 "test1.pgc" - { - ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost:55432/", "connectdb", NULL, NULL, 0); - } + { ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost:55432/" , "connectdb" , NULL , NULL, 0); } #line 47 "test1.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 48 "test1.pgc" strcpy(pw, "connectpw"); strcpy(db, "tcp:postgresql://localhost:55432/connectdb"); - { - ECPGconnect(__LINE__, 0, db, "connectuser", pw, NULL, 0); - } + { ECPGconnect(__LINE__, 0, db , "connectuser" , pw , NULL, 0); } #line 52 "test1.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 53 "test1.pgc" - { - ECPGconnect(__LINE__, 0, "unix:postgresql://localhost:55432/connectdb", "connectuser", "connectpw", NULL, 0); - } + { ECPGconnect(__LINE__, 0, "unix:postgresql://localhost:55432/connectdb" , "connectuser" , "connectpw" , NULL, 0); } #line 55 "test1.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 56 "test1.pgc" - { - ECPGconnect(__LINE__, 0, "unix:postgresql://localhost:55432/connectdb", "connectuser", NULL, NULL, 0); - } + { ECPGconnect(__LINE__, 0, "unix:postgresql://localhost:55432/connectdb" , "connectuser" , NULL , NULL, 0); } #line 58 "test1.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 59 "test1.pgc" /* wrong db */ - { - ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost:55432/nonexistant", "connectuser", "connectpw", NULL, 0); - } + { ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost:55432/nonexistant" , "connectuser" , "connectpw" , NULL, 0); } #line 62 "test1.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 63 "test1.pgc" /* wrong port */ - { - ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost:20/connectdb", "connectuser", "connectpw", NULL, 0); - } + { ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost:20/connectdb" , "connectuser" , "connectpw" , NULL, 0); } #line 66 "test1.pgc" /* no disconnect necessary */ /* wrong password */ - { - ECPGconnect(__LINE__, 0, "unix:postgresql://localhost:55432/connectdb", "connectuser", "wrongpw", NULL, 0); - } + { ECPGconnect(__LINE__, 0, "unix:postgresql://localhost:55432/connectdb" , "connectuser" , "wrongpw" , NULL, 0); } #line 70 "test1.pgc" /* no disconnect necessary */ diff --git a/src/interfaces/ecpg/test/expected/connect-test2.c b/src/interfaces/ecpg/test/expected/connect-test2.c index 464a7cdf4d..ce18b08bf8 100644 --- a/src/interfaces/ecpg/test/expected/connect-test2.c +++ b/src/interfaces/ecpg/test/expected/connect-test2.c @@ -32,15 +32,14 @@ int main(void) { /* exec sql begin declare section */ - - + + #line 17 "test2.pgc" - char id[200]; - + char id [ 200 ] ; + #line 18 "test2.pgc" - char res[200]; - + char res [ 200 ] ; /* exec sql end declare section */ #line 19 "test2.pgc" @@ -48,78 +47,56 @@ main(void) ECPGdebug(1, stderr); strcpy(id, "first"); - { - ECPGconnect(__LINE__, 0, "connectdb", NULL, NULL, id, 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , id, 0); } #line 24 "test2.pgc" - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, "second", 0); - } + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , "second", 0); } #line 25 "test2.pgc" /* this selects from "second" which was opened last */ - { - ECPGdo(__LINE__, 0, 1, NULL, "select current_database () ", ECPGt_EOIT, - ECPGt_char, (res), (long) 200, (long) 1, (200) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "select current_database () ", ECPGt_EOIT, + ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 28 "test2.pgc" - { - ECPGdo(__LINE__, 0, 1, "first", "select current_database () ", ECPGt_EOIT, - ECPGt_char, (res), (long) 200, (long) 1, (200) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, "first", "select current_database () ", ECPGt_EOIT, + ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 29 "test2.pgc" - { - ECPGdo(__LINE__, 0, 1, "second", "select current_database () ", ECPGt_EOIT, - ECPGt_char, (res), (long) 200, (long) 1, (200) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, "second", "select current_database () ", ECPGt_EOIT, + ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 30 "test2.pgc" - { - ECPGsetconn(__LINE__, "first"); - } + { ECPGsetconn(__LINE__, "first");} #line 32 "test2.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select current_database () ", ECPGt_EOIT, - ECPGt_char, (res), (long) 200, (long) 1, (200) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "select current_database () ", ECPGt_EOIT, + ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 33 "test2.pgc" /* this will disconnect from "first" */ - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 36 "test2.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select current_database () ", ECPGt_EOIT, - ECPGt_char, (res), (long) 200, (long) 1, (200) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "select current_database () ", ECPGt_EOIT, + ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 37 "test2.pgc" /* error here since "first" is already disconnected */ - { - ECPGdisconnect(__LINE__, id); - } + { ECPGdisconnect(__LINE__, id);} #line 40 "test2.pgc" /* disconnect from "second" */ - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 43 "test2.pgc" diff --git a/src/interfaces/ecpg/test/expected/connect-test3.c b/src/interfaces/ecpg/test/expected/connect-test3.c index 496083da5e..5e4451a4c5 100644 --- a/src/interfaces/ecpg/test/expected/connect-test3.c +++ b/src/interfaces/ecpg/test/expected/connect-test3.c @@ -31,15 +31,14 @@ int main(void) { /* exec sql begin declare section */ - - + + #line 16 "test3.pgc" - char id[200]; - + char id [ 200 ] ; + #line 17 "test3.pgc" - char res[200]; - + char res [ 200 ] ; /* exec sql end declare section */ #line 18 "test3.pgc" @@ -47,83 +46,60 @@ main(void) ECPGdebug(1, stderr); strcpy(id, "first"); - { - ECPGconnect(__LINE__, 0, "connectdb", NULL, NULL, id, 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , id, 0); } #line 23 "test3.pgc" - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, "second", 0); - } + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , "second", 0); } #line 24 "test3.pgc" /* this selects from "second" which was opened last */ - { - ECPGdo(__LINE__, 0, 1, NULL, "select current_database () ", ECPGt_EOIT, - ECPGt_char, (res), (long) 200, (long) 1, (200) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "select current_database () ", ECPGt_EOIT, + ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 27 "test3.pgc" /* will close "second" */ - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 30 "test3.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select current_database () ", ECPGt_EOIT, - ECPGt_char, (res), (long) 200, (long) 1, (200) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "select current_database () ", ECPGt_EOIT, + ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 31 "test3.pgc" - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, "second", 0); - } + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , "second", 0); } #line 33 "test3.pgc" /* will close "second" */ - { - ECPGdisconnect(__LINE__, "DEFAULT"); - } + { ECPGdisconnect(__LINE__, "DEFAULT");} #line 35 "test3.pgc" - { - ECPGconnect(__LINE__, 0, "connectdb", NULL, NULL, "second", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "second", 0); } #line 37 "test3.pgc" - { - ECPGdisconnect(__LINE__, "ALL"); - } + { ECPGdisconnect(__LINE__, "ALL");} #line 38 "test3.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 40 "test3.pgc" - { - ECPGdisconnect(__LINE__, "DEFAULT"); - } + { ECPGdisconnect(__LINE__, "DEFAULT");} #line 41 "test3.pgc" - { - ECPGdisconnect(__LINE__, "ALL"); - } + { ECPGdisconnect(__LINE__, "ALL");} #line 42 "test3.pgc" /* - * exec sql disconnect; exec sql disconnect name; + * exec sql disconnect; + * exec sql disconnect name; * - * are used in other tests + * are used in other tests */ return (0); diff --git a/src/interfaces/ecpg/test/expected/connect-test4.c b/src/interfaces/ecpg/test/expected/connect-test4.c index 2b9f4ff297..ba15660f33 100644 --- a/src/interfaces/ecpg/test/expected/connect-test4.c +++ b/src/interfaces/ecpg/test/expected/connect-test4.c @@ -28,21 +28,15 @@ main(void) { ECPGdebug(1, stderr); - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , "main", 0); } #line 13 "test4.pgc" - { - ECPGsetconn(__LINE__, "main"); - } + { ECPGsetconn(__LINE__, "main");} #line 15 "test4.pgc" - { - ECPGdisconnect(__LINE__, "DEFAULT"); - } + { ECPGdisconnect(__LINE__, "DEFAULT");} #line 17 "test4.pgc" diff --git a/src/interfaces/ecpg/test/expected/connect-test5.c b/src/interfaces/ecpg/test/expected/connect-test5.c index 36e902979c..6075aacf13 100644 --- a/src/interfaces/ecpg/test/expected/connect-test5.c +++ b/src/interfaces/ecpg/test/expected/connect-test5.c @@ -22,181 +22,122 @@ int main(void) { /* exec sql begin declare section */ - - + + #line 16 "test5.pgc" - char db[200]; - + char db [ 200 ] ; + #line 17 "test5.pgc" - char id[200]; - + char id [ 200 ] ; /* exec sql end declare section */ #line 18 "test5.pgc" ECPGdebug(1, stderr); - { - ECPGconnect(__LINE__, 0, "connectdb", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "main", 0); } #line 22 "test5.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);} #line 23 "test5.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 24 "test5.pgc" - /* <-- "main" not specified */ + /* <-- "main" not specified */ strcpy(db, "connectdb"); strcpy(id, "main"); - { - ECPGconnect(__LINE__, 0, db, NULL, NULL, id, 0); - } + { ECPGconnect(__LINE__, 0, db , NULL,NULL , id, 0); } #line 28 "test5.pgc" - { - ECPGdisconnect(__LINE__, id); - } + { ECPGdisconnect(__LINE__, id);} #line 29 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "connectdb", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "main", 0); } #line 31 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 32 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "connectdb", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "main", 0); } #line 34 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 35 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "connectdb", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "main", 0); } #line 37 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 38 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "", "connectdb", NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "" , "connectdb" , NULL , "main", 0); } #line 40 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 41 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "connectdb", "connectuser", "connectdb", "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , "connectuser" , "connectdb" , "main", 0); } #line 43 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 44 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/connectdb", "connectuser", NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/connectdb" , "connectuser" , NULL , "main", 0); } #line 46 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 47 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/connectdb", "connectuser", NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/connectdb" , "connectuser" , NULL , "main", 0); } #line 49 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 50 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/connectdb", "connectuser", NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/connectdb" , "connectuser" , NULL , "main", 0); } #line 52 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 53 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "unix:postgresql://200.46.204.71/connectdb", "connectuser", NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "unix:postgresql://200.46.204.71/connectdb" , "connectuser" , NULL , "main", 0); } #line 55 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 56 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/", "connectdb", NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/" , "connectdb" , NULL , "main", 0); } #line 58 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 59 "test5.pgc" /* connect twice */ - { - ECPGconnect(__LINE__, 0, "connectdb", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "main", 0); } #line 62 "test5.pgc" - { - ECPGconnect(__LINE__, 0, "connectdb", NULL, NULL, "main", 0); - } + { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "main", 0); } #line 63 "test5.pgc" - { - ECPGdisconnect(__LINE__, "main"); - } + { ECPGdisconnect(__LINE__, "main");} #line 64 "test5.pgc" /* not connected */ - { - ECPGdisconnect(__LINE__, "nonexistant"); - } + { ECPGdisconnect(__LINE__, "nonexistant");} #line 67 "test5.pgc" diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c index a818634675..ccd7815b83 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c @@ -29,116 +29,94 @@ int main(void) { /* exec sql begin declare section */ - - - - - + + + + + #line 14 "dt_test.pgc" - date date1; - + date date1 ; + #line 15 "dt_test.pgc" - timestamp ts1; - + timestamp ts1 ; + #line 16 "dt_test.pgc" - interval *iv1, - iv2; - + interval * iv1 , iv2 ; + #line 17 "dt_test.pgc" - char *text; - + char * text ; /* exec sql end declare section */ #line 18 "dt_test.pgc" - date date2; - int mdy[3] = {4, 19, 1998}; - char *fmt, - *out, - *in; - char *d1 = "Mon Jan 17 1966"; - char *t1 = "2000-7-12 17:34:29"; - int i; - - ECPGdebug(1, stderr); - /* exec sql whenever sqlerror do sqlprint ( ) ; */ + date date2; + int mdy[3] = { 4, 19, 1998 }; + char *fmt, *out, *in; + char *d1 = "Mon Jan 17 1966"; + char *t1 = "2000-7-12 17:34:29"; + int i; + + ECPGdebug(1, stderr); + /* exec sql whenever sqlerror do sqlprint ( ) ; */ #line 27 "dt_test.pgc" - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); #line 28 "dt_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 28 "dt_test.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table date_test ( d date , ts timestamp ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table date_test ( d date , ts timestamp ) ", ECPGt_EOIT, ECPGt_EORT); #line 29 "dt_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 29 "dt_test.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT); #line 30 "dt_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 30 "dt_test.pgc" - date1 = PGTYPESdate_from_asc(d1, NULL); - ts1 = PGTYPEStimestamp_from_asc(t1, NULL); + date1 = PGTYPESdate_from_asc(d1, NULL); + ts1 = PGTYPEStimestamp_from_asc(t1, NULL); - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into date_test ( d , ts ) values( ? , ? ) ", - ECPGt_date, &(date1), (long) 1, (long) 1, sizeof(date), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_timestamp, &(ts1), (long) 1, (long) 1, sizeof(timestamp), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into date_test ( d , ts ) values ( ? , ? ) ", + ECPGt_date,&(date1),(long)1,(long)1,sizeof(date), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_timestamp,&(ts1),(long)1,(long)1,sizeof(timestamp), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 35 "dt_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 35 "dt_test.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select * from date_test where d = ? ", - ECPGt_date, &(date1), (long) 1, (long) 1, sizeof(date), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, - ECPGt_date, &(date1), (long) 1, (long) 1, sizeof(date), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_timestamp, &(ts1), (long) 1, (long) 1, sizeof(timestamp), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select * from date_test where d = ? ", + ECPGt_date,&(date1),(long)1,(long)1,sizeof(date), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, + ECPGt_date,&(date1),(long)1,(long)1,sizeof(date), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_timestamp,&(ts1),(long)1,(long)1,sizeof(timestamp), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 37 "dt_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 37 "dt_test.pgc" text = PGTYPESdate_to_asc(date1); - - printf("Date: %s\n", text); + printf ("Date: %s\n", text); free(text); text = PGTYPEStimestamp_to_asc(ts1); - - printf("timestamp: %s\n", text); + printf ("timestamp: %s\n", text); free(text); iv1 = PGTYPESinterval_from_asc("13556 days 12 hours 34 minutes 14 seconds ", NULL); PGTYPESinterval_copy(iv1, &iv2); text = PGTYPESinterval_to_asc(&iv2); - - printf("interval: %s\n", text); + printf ("interval: %s\n", text); free(text); PGTYPESdate_mdyjul(mdy, &date2); @@ -153,9 +131,8 @@ main(void) ts1 = PGTYPEStimestamp_from_asc("2003-12-04 17:34:29", NULL); text = PGTYPEStimestamp_to_asc(ts1); - fmt = "(ddd), mmm. dd, yyyy, repeat: (ddd), mmm. dd, yyyy. end"; - out = (char *) malloc(strlen(fmt) + 1); + out = (char*) malloc(strlen(fmt) + 1); date1 = PGTYPESdate_from_timestamp(ts1); PGTYPESdate_fmt_asc(date1, fmt, out); printf("date_day of %s is %d\n", text, PGTYPESdate_dayofweek(date1)); @@ -165,306 +142,249 @@ main(void) /* rdate_defmt_asc() */ - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "yy/mm/dd"; in = "In the year 1995, the month of December, it is the 25th day"; - - /* - * 0123456789012345678901234567890123456789012345678901234567890 0 - * 1 2 3 4 5 6 + /* 0123456789012345678901234567890123456789012345678901234567890 + * 0 1 2 3 4 5 6 */ PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc1: %s\n", text); free(text); - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "mmmm. dd. yyyy"; in = "12/25/95"; PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc2: %s\n", text); free(text); - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "yy/mm/dd"; in = "95/12/25"; PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc3: %s\n", text); free(text); - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "yy/mm/dd"; in = "1995, December 25th"; PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc4: %s\n", text); free(text); - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "dd-mm-yy"; in = "This is 25th day of December, 1995"; PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc5: %s\n", text); free(text); - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "mmddyy"; in = "Dec. 25th, 1995"; PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc6: %s\n", text); free(text); - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "mmm. dd. yyyy"; in = "dec 25th 1995"; PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc7: %s\n", text); free(text); - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "mmm. dd. yyyy"; in = "DEC-25-1995"; PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc8: %s\n", text); free(text); - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "mm yy dd."; in = "12199525"; PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc9: %s\n", text); free(text); - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "yyyy fierj mm dd."; in = "19951225"; PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc10: %s\n", text); free(text); - date1 = 0; - text = ""; - + date1 = 0; text = ""; fmt = "mm/dd/yy"; in = "122595"; PGTYPESdate_defmt_asc(&date1, fmt, in); text = PGTYPESdate_to_asc(date1); - printf("date_defmt_asc12: %s\n", text); free(text); PGTYPEStimestamp_current(&ts1); text = PGTYPEStimestamp_to_asc(ts1); - /* can't output this in regression mode */ /* printf("timestamp_current: Now: %s\n", text); */ free(text); ts1 = PGTYPEStimestamp_from_asc("96-02-29", NULL); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_to_asc1: %s\n", text); free(text); ts1 = PGTYPEStimestamp_from_asc("1994-02-11 3:10:35", NULL); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_to_asc2: %s\n", text); free(text); ts1 = PGTYPEStimestamp_from_asc("1994-02-11 26:10:35", NULL); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_to_asc3: %s\n", text); free(text); /* abc-03:10:35-def-02/11/94-gh */ -/* 12345678901234567890123456789 */ +/* 12345678901234567890123456789 */ - out = (char *) malloc(32); + out = (char*) malloc(32); i = PGTYPEStimestamp_fmt_asc(&ts1, out, 31, "abc-%X-def-%x-ghi%%"); printf("timestamp_fmt_asc: %d: %s\n", i, out); free(out); fmt = "This is a %m/%d/%y %H-%Ml%Stest"; - in = "This is a 4/12/80 3-39l12test"; + in = "This is a 4/12/80 3-39l12test"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); fmt = "%a %b %d %H:%M:%S %z %Y"; - in = "Tue Jul 22 17:28:44 +0200 2003"; + in = "Tue Jul 22 17:28:44 +0200 2003"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); fmt = "%a %b %d %H:%M:%S %z %Y"; - in = "Tue Feb 29 17:28:44 +0200 2000"; + in = "Tue Feb 29 17:28:44 +0200 2000"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); fmt = "%a %b %d %H:%M:%S %z %Y"; - in = "Tue Feb 29 17:28:44 +0200 1900"; + in = "Tue Feb 29 17:28:44 +0200 1900"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error (should be error!): %d\n", in, fmt, text, i); free(text); fmt = "%a %b %d %H:%M:%S %z %Y"; - in = "Tue Feb 29 17:28:44 +0200 1996"; + in = "Tue Feb 29 17:28:44 +0200 1996"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); fmt = "%b %d %H:%M:%S %z %Y"; - in = " Jul 31 17:28:44 +0200 1996"; + in = " Jul 31 17:28:44 +0200 1996"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); fmt = "%b %d %H:%M:%S %z %Y"; - in = " Jul 32 17:28:44 +0200 1996"; + in = " Jul 32 17:28:44 +0200 1996"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error (should be error!): %d\n", in, fmt, text, i); free(text); fmt = "%a %b %d %H:%M:%S %z %Y"; - in = "Tue Feb 29 17:28:44 +0200 1997"; + in = "Tue Feb 29 17:28:44 +0200 1997"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error (should be error!): %d\n", in, fmt, text, i); free(text); fmt = "%"; - in = "Tue Jul 22 17:28:44 +0200 2003"; + in = "Tue Jul 22 17:28:44 +0200 2003"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error (should be error!): %d\n", in, fmt, text, i); free(text); fmt = "a %"; - in = "Tue Jul 22 17:28:44 +0200 2003"; + in = "Tue Jul 22 17:28:44 +0200 2003"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error (should be error!): %d\n", in, fmt, text, i); free(text); fmt = "%b, %d %H_%M`%S %z %Y"; - in = " Jul, 22 17_28 `44 +0200 2003 "; + in = " Jul, 22 17_28 `44 +0200 2003 "; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); fmt = "%a %b %%%d %H:%M:%S %Z %Y"; - in = "Tue Jul %22 17:28:44 CEST 2003"; + in = "Tue Jul %22 17:28:44 CEST 2003"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); fmt = "%a %b %%%d %H:%M:%S %Z %Y"; - in = "Tue Jul %22 17:28:44 CEST 2003"; + in = "Tue Jul %22 17:28:44 CEST 2003"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); fmt = "abc%n %C %B %%%d %H:%M:%S %Z %Y"; - in = "abc\n 19 October %22 17:28:44 CEST 2003"; + in = "abc\n 19 October %22 17:28:44 CEST 2003"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); fmt = "abc%n %C %B %%%d %H:%M:%S %Z %y"; - in = "abc\n 18 October %34 17:28:44 CEST 80"; + in = "abc\n 18 October %34 17:28:44 CEST 80"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error (should be error!): %d\n", in, fmt, text, i); free(text); fmt = ""; - in = "abc\n 18 October %34 17:28:44 CEST 80"; + in = "abc\n 18 October %34 17:28:44 CEST 80"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error (should be error!): %d\n", in, fmt, text, i); free(text); fmt = NULL; - in = "1980-04-12 3:49:44 "; + in = "1980-04-12 3:49:44 "; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, NULL) = %s, error: %d\n", in, text, i); free(text); fmt = "%B %d, %Y. Time: %I:%M%p"; - in = "July 14, 1988. Time: 9:15am"; + in = "July 14, 1988. Time: 9:15am"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); @@ -472,7 +392,6 @@ main(void) fmt = "%B %d at %I:%M %p in the year %Y"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); @@ -480,7 +399,6 @@ main(void) fmt = "%Y, %B %d. Time: %I:%M %p"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); @@ -488,7 +406,6 @@ main(void) fmt = "%Y, %B %d. Time: %I:%M%p"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); @@ -496,28 +413,22 @@ main(void) fmt = "%Y, %P %B %d. Time: %I:%M"; i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1); text = PGTYPEStimestamp_to_asc(ts1); - printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); - { - ECPGtrans(__LINE__, NULL, "rollback"); + { ECPGtrans(__LINE__, NULL, "rollback"); #line 350 "dt_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 350 "dt_test.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); + { ECPGdisconnect(__LINE__, "CURRENT"); #line 351 "dt_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 351 "dt_test.pgc" return (0); } + diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c index 72b1199dd8..e5388b6fa8 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c @@ -25,76 +25,73 @@ #line 8 "dt_test2.pgc" -char *dates[] = {"19990108foobar", - "19990108 foobar", - "1999-01-08 foobar", - "January 8, 1999", - "1999-01-08", - "1/8/1999", - "1/18/1999", - "01/02/03", - "1999-Jan-08", - "Jan-08-1999", - "08-Jan-1999", - "99-Jan-08", - "08-Jan-99", - "08-Jan-06", - "Jan-08-99", - "19990108", - "990108", - "1999.008", - "J2451187", - "January 8, 99 BC", -NULL}; - -char *times[] = {"0:04", - "1:59 PDT", - "13:24:40 -8:00", - "13:24:40.495+3", -NULL}; - -char *intervals[] = {"1 minute", - "1 12:59:10", - "2 day 12 hour 59 minute 10 second", - "1 days 12 hrs 59 mins 10 secs", - "1 days 1 hours 1 minutes 1 seconds", - "1 year 59 mins", - "1 year 59 mins foobar", -NULL}; +char *dates[] = { "19990108foobar", + "19990108 foobar", + "1999-01-08 foobar", + "January 8, 1999", + "1999-01-08", + "1/8/1999", + "1/18/1999", + "01/02/03", + "1999-Jan-08", + "Jan-08-1999", + "08-Jan-1999", + "99-Jan-08", + "08-Jan-99", + "08-Jan-06", + "Jan-08-99", + "19990108", + "990108", + "1999.008", + "J2451187", + "January 8, 99 BC", + NULL }; + +char *times[] = { "0:04", + "1:59 PDT", + "13:24:40 -8:00", + "13:24:40.495+3", + NULL }; + +char *intervals[] = { "1 minute", + "1 12:59:10", + "2 day 12 hour 59 minute 10 second", + "1 days 12 hrs 59 mins 10 secs", + "1 days 1 hours 1 minutes 1 seconds", + "1 year 59 mins", + "1 year 59 mins foobar", + NULL }; int main(void) { /* exec sql begin declare section */ - - - - - - + + + + + + #line 51 "dt_test2.pgc" - date date1; - + date date1 ; + #line 52 "dt_test2.pgc" - timestamp ts1, - ts2; - + timestamp ts1 , ts2 ; + #line 53 "dt_test2.pgc" - char *text; - + char * text ; + #line 54 "dt_test2.pgc" - interval *i1; - + interval * i1 ; + #line 55 "dt_test2.pgc" - date *dc; - + date * dc ; /* exec sql end declare section */ #line 56 "dt_test2.pgc" - int i, - j; - char *endptr; + int i, j; + char *endptr; ECPGdebug(1, stderr); @@ -108,45 +105,38 @@ main(void) dc = PGTYPESdate_new(); *dc = date1; text = PGTYPESdate_to_asc(*dc); - printf("Date of timestamp: %s\n", text); free(text); PGTYPESdate_free(dc); for (i = 0; dates[i]; i++) { - bool err = false; - + bool err = false; date1 = PGTYPESdate_from_asc(dates[i], &endptr); - if (date1 == INT_MIN) - { + if (date1 == INT_MIN) { err = true; } text = PGTYPESdate_to_asc(date1); - printf("Date[%d]: %s (%c - %c)\n", - i, err ? "-" : text, - endptr ? 'N' : 'Y', - err ? 'T' : 'F'); + i, err ? "-" : text, + endptr ? 'N' : 'Y', + err ? 'T' : 'F'); free(text); if (!err) { for (j = 0; times[j]; j++) { - int length = strlen(dates[i]) - + 1 - + strlen(times[j]) - + 1; - char *t = malloc(length); - + int length = strlen(dates[i]) + + 1 + + strlen(times[j]) + + 1; + char* t = malloc(length); sprintf(t, "%s %s", dates[i], times[j]); ts1 = PGTYPEStimestamp_from_asc(t, NULL); text = PGTYPEStimestamp_to_asc(ts1); - - if (i != 19 || j != 3) /* timestamp as integer or double - * differ for this case */ + 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); } } @@ -156,8 +146,7 @@ main(void) for (i = 0; intervals[i]; i++) { - interval *ic; - + interval *ic; i1 = PGTYPESinterval_from_asc(intervals[i], &endptr); if (*endptr) printf("endptr set to %s\n", endptr); @@ -170,14 +159,12 @@ main(void) if (j < 0) continue; text = PGTYPESinterval_to_asc(i1); - printf("interval[%d]: %s\n", i, text ? text : "-"); free(text); ic = PGTYPESinterval_new(); PGTYPESinterval_copy(i1, ic); text = PGTYPESinterval_to_asc(i1); - printf("interval_copy[%d]: %s\n", i, text ? text : "-"); free(text); PGTYPESinterval_free(ic); @@ -185,3 +172,4 @@ main(void) return (0); } + diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c index 903b824704..f4b9964a16 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c @@ -34,64 +34,49 @@ NOTE: This file has a different expect file for regression tests on MinGW32 int main(void) { - char *text = "error\n"; - numeric *value1, - *value2, - *res; - + char *text="error\n"; + numeric *value1, *value2, *res; /* exec sql begin declare section */ - - /* = {0, 0, 0, 0, 0, NULL, NULL} ; */ - + + /* = {0, 0, 0, 0, 0, NULL, NULL} ; */ + #line 22 "num_test.pgc" - numeric *des; - + numeric * des ; /* exec sql end declare section */ #line 24 "num_test.pgc" - double d; - long l1, - l2; - int i; + double d; + long l1, l2; + int i; ECPGdebug(1, stderr); /* exec sql whenever sqlerror do sqlprint ( ) ; */ #line 30 "num_test.pgc" - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); #line 32 "num_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 32 "num_test.pgc" - { - ECPGsetcommit(__LINE__, "off", NULL); + { ECPGsetcommit(__LINE__, "off", NULL); #line 34 "num_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 34 "num_test.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test ( text char ( 5 ) , num numeric ( 14 , 7 ) ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table test ( text char ( 5 ) , num numeric ( 14 , 7 ) ) ", ECPGt_EOIT, ECPGt_EORT); #line 35 "num_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 35 "num_test.pgc" value1 = PGTYPESnumeric_new(); PGTYPESnumeric_from_int(1407, value1); text = PGTYPESnumeric_to_asc(value1, -1); - printf("from int = %s\n", text); free(text); PGTYPESnumeric_free(value1); @@ -101,28 +86,23 @@ main(void) res = PGTYPESnumeric_new(); PGTYPESnumeric_add(value1, value2, res); text = PGTYPESnumeric_to_asc(res, -1); - printf("add = %s\n", text); free(text); PGTYPESnumeric_sub(res, value2, res); text = PGTYPESnumeric_to_asc(res, -1); - printf("sub = %s\n", text); free(text); PGTYPESnumeric_free(value2); des = PGTYPESnumeric_new(); PGTYPESnumeric_copy(res, des); - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( text , num ) values( 'test' , ? ) ", - ECPGt_numeric, &(des), (long) 1, (long) 0, sizeof(numeric), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( text , num ) values ( 'test' , ? ) ", + ECPGt_numeric,&(des),(long)1,(long)0,sizeof(numeric), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 60 "num_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 60 "num_test.pgc" @@ -130,21 +110,17 @@ main(void) PGTYPESnumeric_mul(value1, value2, res); PGTYPESnumeric_free(value2); - { - ECPGdo(__LINE__, 0, 1, NULL, "select num from test where text = 'test' ", ECPGt_EOIT, - ECPGt_numeric, &(des), (long) 1, (long) 0, sizeof(numeric), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select num from test where text = 'test' ", ECPGt_EOIT, + ECPGt_numeric,&(des),(long)1,(long)0,sizeof(numeric), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 66 "num_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 66 "num_test.pgc" PGTYPESnumeric_mul(res, des, res); text = PGTYPESnumeric_to_asc(res, -1); - printf("mul = %s\n", text); free(text); PGTYPESnumeric_free(des); @@ -152,7 +128,6 @@ main(void) value2 = PGTYPESnumeric_from_asc("10000", NULL); PGTYPESnumeric_div(res, value2, res); text = PGTYPESnumeric_to_asc(res, -1); - PGTYPESnumeric_to_double(res, &d); printf("div = %s %e\n", text, d); @@ -166,24 +141,19 @@ main(void) PGTYPESnumeric_free(value2); PGTYPESnumeric_free(res); - { - ECPGtrans(__LINE__, NULL, "rollback"); + { ECPGtrans(__LINE__, NULL, "rollback"); #line 90 "num_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 90 "num_test.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); + { ECPGdisconnect(__LINE__, "CURRENT"); #line 91 "num_test.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 91 "num_test.pgc" return (0); } + diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c index 41d2511c40..9db09e7188 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c @@ -32,149 +32,112 @@ NOTE: This file has a different expect file for regression tests on MinGW32 */ -char *nums[] = {"2E394", "-2", ".794", "3.44", "592.49E21", "-32.84e4", - "2E-394", ".1E-2", "+.0", "-592.49E-07", "+32.84e-4", - ".500001", "-.5000001", - "1234567890123456789012345678.91", /* 30 digits should fit into decimal */ - "1234567890123456789012345678.921", /* 31 digits should NOT fit into - * decimal */ - "not a number", -NULL}; +char* nums[] = { "2E394", "-2", ".794", "3.44", "592.49E21", "-32.84e4", + "2E-394", ".1E-2", "+.0", "-592.49E-07", "+32.84e-4", + ".500001", "-.5000001", + "1234567890123456789012345678.91", /* 30 digits should fit + into decimal */ + "1234567890123456789012345678.921", /* 31 digits should NOT + fit into decimal */ + "not a number", + NULL}; static void - check_errno(void); +check_errno(void); int main(void) { - char *text = "error\n"; - char *endptr; - numeric *num, - *nin; - decimal *dec; - long l; - int i, - j, - k, - q, - r, - count = 0; - double d; - numeric **numarr = (numeric **) calloc(1, sizeof(numeric)); + char *text="error\n"; + char *endptr; + numeric *num, *nin; + decimal *dec; + long l; + int i, j, k, q, r, count = 0; + double d; + numeric **numarr = (numeric **) calloc(1, sizeof(numeric)); ECPGdebug(1, stderr); for (i = 0; nums[i]; i++) { num = PGTYPESnumeric_from_asc(nums[i], &endptr); - if (!num) - check_errno(); + if (!num) check_errno(); if (endptr != NULL) { printf("endptr of %d is not NULL\n", i); if (*endptr != '\0') printf("*endptr of %d is not \\0\n", i); } - if (!num) - continue; + if (!num) continue; numarr = realloc(numarr, sizeof(numeric *) * (count + 1)); numarr[count++] = num; text = PGTYPESnumeric_to_asc(num, -1); - - if (!text) - check_errno(); - printf("num[%d,1]: %s\n", i, text); - free(text); + if (!text) check_errno(); + printf("num[%d,1]: %s\n", i, text); free(text); text = PGTYPESnumeric_to_asc(num, 0); - - if (!text) - check_errno(); - printf("num[%d,2]: %s\n", i, text); - free(text); + if (!text) check_errno(); + printf("num[%d,2]: %s\n", i, text); free(text); text = PGTYPESnumeric_to_asc(num, 1); - - if (!text) - check_errno(); - printf("num[%d,3]: %s\n", i, text); - free(text); + if (!text) check_errno(); + printf("num[%d,3]: %s\n", i, text); free(text); text = PGTYPESnumeric_to_asc(num, 2); - - if (!text) - check_errno(); - printf("num[%d,4]: %s\n", i, text); - free(text); + if (!text) check_errno(); + printf("num[%d,4]: %s\n", i, text); free(text); nin = PGTYPESnumeric_new(); text = PGTYPESnumeric_to_asc(nin, 2); - - if (!text) - check_errno(); - printf("num[%d,5]: %s\n", i, text); - free(text); + if (!text) check_errno(); + printf("num[%d,5]: %s\n", i, text); free(text); r = PGTYPESnumeric_to_long(num, &l); - if (r) - check_errno(); - printf("num[%d,6]: %ld (r: %d)\n", i, r ? 0L : l, r); + if (r) check_errno(); + printf("num[%d,6]: %ld (r: %d)\n", i, r?0L:l, r); if (r == 0) { r = PGTYPESnumeric_from_long(l, nin); - if (r) - check_errno(); + if (r) check_errno(); text = PGTYPESnumeric_to_asc(nin, 2); - q = PGTYPESnumeric_cmp(num, nin); printf("num[%d,7]: %s (r: %d - cmp: %d)\n", i, text, r, q); free(text); } r = PGTYPESnumeric_to_int(num, &k); - if (r) - check_errno(); - printf("num[%d,8]: %d (r: %d)\n", i, r ? 0 : k, r); + if (r) check_errno(); + printf("num[%d,8]: %d (r: %d)\n", i, r?0:k, r); if (r == 0) { r = PGTYPESnumeric_from_int(k, nin); - if (r) - check_errno(); + if (r) check_errno(); text = PGTYPESnumeric_to_asc(nin, 2); - q = PGTYPESnumeric_cmp(num, nin); printf("num[%d,9]: %s (r: %d - cmp: %d)\n", i, text, r, q); free(text); } r = PGTYPESnumeric_to_double(num, &d); - if (r) - check_errno(); - printf("num[%d,10]: %g (r: %d)\n", i, r ? 0.0 : d, r); - - /* - * do not test double to numeric because - extra digits are different - * on different architectures - PGTYPESnumeric_from_double internally - * calls PGTYPESnumeric_from_asc anyway + if (r) check_errno(); + printf("num[%d,10]: %g (r: %d)\n", i, r?0.0:d, r); + /* do not test double to numeric because + * - extra digits are different on different architectures + * - PGTYPESnumeric_from_double internally calls PGTYPESnumeric_from_asc anyway */ dec = PGTYPESdecimal_new(); r = PGTYPESnumeric_to_decimal(num, dec); - if (r) - check_errno(); - - /* - * we have no special routine for outputting decimal, it would convert - * to a numeric anyway - */ + if (r) check_errno(); + /* we have no special routine for outputting decimal, it would + * convert to a numeric anyway */ printf("num[%d,11]: - (r: %d)\n", i, r); if (r == 0) { r = PGTYPESnumeric_from_decimal(dec, nin); - if (r) - check_errno(); + if (r) check_errno(); text = PGTYPESnumeric_to_asc(nin, 2); - q = PGTYPESnumeric_cmp(num, nin); printf("num[%d,12]: %s (r: %d - cmp: %d)\n", i, text, r, q); free(text); @@ -189,11 +152,10 @@ main(void) { for (j = 0; j < count; j++) { - numeric *a = PGTYPESnumeric_new(); - numeric *s = PGTYPESnumeric_new(); - numeric *m = PGTYPESnumeric_new(); - numeric *d = PGTYPESnumeric_new(); - + numeric* a = PGTYPESnumeric_new(); + numeric* s = PGTYPESnumeric_new(); + numeric* m = PGTYPESnumeric_new(); + numeric* d = PGTYPESnumeric_new(); r = PGTYPESnumeric_add(numarr[i], numarr[j], a); if (r) { @@ -203,7 +165,6 @@ main(void) else { text = PGTYPESnumeric_to_asc(a, 10); - printf("num[a,%d,%d]: %s\n", i, j, text); free(text); } @@ -216,7 +177,6 @@ main(void) else { text = PGTYPESnumeric_to_asc(s, 10); - printf("num[s,%d,%d]: %s\n", i, j, text); free(text); } @@ -229,7 +189,6 @@ main(void) else { text = PGTYPESnumeric_to_asc(m, 10); - printf("num[m,%d,%d]: %s\n", i, j, text); free(text); } @@ -242,7 +201,6 @@ main(void) else { text = PGTYPESnumeric_to_asc(d, 10); - printf("num[d,%d,%d]: %s\n", i, j, text); free(text); } @@ -252,7 +210,6 @@ main(void) for (i = 0; i < count; i++) { text = PGTYPESnumeric_to_asc(numarr[i], -1); - printf("%d: %s\n", i, text); free(text); } @@ -263,7 +220,7 @@ main(void) static void check_errno(void) { - switch (errno) + switch(errno) { case 0: printf("(no errno set) - "); diff --git a/src/interfaces/ecpg/test/expected/preproc-comment.c b/src/interfaces/ecpg/test/expected/preproc-comment.c index 3297ede6b6..23e81708ee 100644 --- a/src/interfaces/ecpg/test/expected/preproc-comment.c +++ b/src/interfaces/ecpg/test/expected/preproc-comment.c @@ -20,29 +20,24 @@ #line 3 "comment.pgc" - /* just a test comment */ int i; - - /* just a test comment int j*/ ; +/* just a test comment */ int i; +/* just a test comment int j*/; /****************************************************************************/ -/* Test comment */ +/* Test comment */ /*--------------------------------------------------------------------------*/ -int -main(void) +int main(void) { - ECPGdebug(1, stderr); + ECPGdebug(1, stderr); - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); - } + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); } #line 17 "comment.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 19 "comment.pgc" - exit(0); + exit (0); } + diff --git a/src/interfaces/ecpg/test/expected/preproc-define.c b/src/interfaces/ecpg/test/expected/preproc-define.c index 9978fead81..4c4caa7295 100644 --- a/src/interfaces/ecpg/test/expected/preproc-define.c +++ b/src/interfaces/ecpg/test/expected/preproc-define.c @@ -30,165 +30,133 @@ -/* exec sql type intarray is int [ 6 ] */ +/* exec sql type intarray is int [ 6 ] */ #line 13 "define.pgc" -typedef int intarray[6]; +typedef int intarray[ 6]; int main(void) { /* exec sql begin declare section */ - typedef char string[8]; + typedef char string [ 8 ] ; #line 21 "define.pgc" - - - - + + + + #line 22 "define.pgc" - intarray amount; - + intarray amount ; + #line 23 "define.pgc" - char name[6][8]; - + char name [ 6 ] [ 8 ] ; + #line 24 "define.pgc" - char letter[6][1]; - + char letter [ 6 ] [ 1 ] ; + #if 0 - + #line 26 "define.pgc" - int not_used; + int not_used ; + #endif /* exec sql end declare section */ #line 29 "define.pgc" - int i, - j; + int i,j; ECPGdebug(1, stderr); - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); #line 34 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 34 "define.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test ( name char ( 8 ) , amount int , letter char ( 1 ) ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table test ( name char ( 8 ) , amount int , letter char ( 1 ) ) ", ECPGt_EOIT, ECPGt_EORT); #line 36 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 36 "define.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 37 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 37 "define.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into Test ( name , amount , letter ) values ( 'false' , 1 , 'f' ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into Test ( name , amount , letter ) values ( 'false' , 1 , 'f' ) ", ECPGt_EOIT, ECPGt_EORT); #line 39 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 39 "define.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( name , amount , letter ) values ( 'true' , 2 , 't' ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( name , amount , letter ) values ( 'true' , 2 , 't' ) ", ECPGt_EOIT, ECPGt_EORT); #line 40 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 40 "define.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 41 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 41 "define.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select * from test ", ECPGt_EOIT, - ECPGt_char, (name), (long) 8, (long) 6, (8) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, (amount), (long) 1, (long) 6, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (letter), (long) 1, (long) 6, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select * from test ", ECPGt_EOIT, + ECPGt_char,(name),(long)8,(long)6,(8)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,(amount),(long)1,(long)6,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(letter),(long)1,(long)6,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 43 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 43 "define.pgc" - for (i = 0, j = sqlca.sqlerrd[2]; i < j; i++) + for (i=0, j=sqlca.sqlerrd[2]; imember; - + int e = y -> member ; + #line 69 "init.pgc" - int c = 10 >> 2; - + int c = 10 >> 2 ; + #line 70 "init.pgc" - bool h = 2 || 1; - + bool h = 2 || 1 ; + #line 71 "init.pgc" - long iay; - + long iay ; /* exec sql end declare section */ #line 72 "init.pgc" - int f = fa(); + int f=fa(); #ifdef _cplusplus /* exec sql begin declare section */ - /* compile error */ - + /* compile error */ + #line 78 "init.pgc" - int k = N::i; - + int k = N : : i ; /* exec sql end declare section */ #line 79 "init.pgc" + #endif ECPGdebug(1, stderr); @@ -215,76 +203,58 @@ main(void) printf("%d %d %d %d %d %d %d %d %d %d %d\n", a, b, b2, c, d, e, f, g, h, i, j); iay = 0; printf("%ld\n", iay); - /* exec sql whenever sqlerror do fa ( ) ; */ + /* exec sql whenever sqlerror do fa ( ) ; */ #line 87 "init.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); #line 88 "init.pgc" - if (sqlca.sqlcode < 0) - fa(); - } +if (sqlca.sqlcode < 0) fa ( );} #line 88 "init.pgc" /* exec sql whenever sqlerror do fb ( 20 ) ; */ #line 89 "init.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); #line 90 "init.pgc" - if (sqlca.sqlcode < 0) - fb(20); - } +if (sqlca.sqlcode < 0) fb ( 20 );} #line 90 "init.pgc" /* exec sql whenever sqlerror do fc ( \"50\" ) ; */ #line 91 "init.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); #line 92 "init.pgc" - if (sqlca.sqlcode < 0) - fc("50"); - } +if (sqlca.sqlcode < 0) fc ( "50" );} #line 92 "init.pgc" /* exec sql whenever sqlerror do fd ( \"50\" , 1 ) ; */ #line 93 "init.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); #line 94 "init.pgc" - if (sqlca.sqlcode < 0) - fd("50", 1); - } +if (sqlca.sqlcode < 0) fd ( "50" , 1 );} #line 94 "init.pgc" /* exec sql whenever sqlerror do fe ( ENUM0 ) ; */ #line 95 "init.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); #line 96 "init.pgc" - if (sqlca.sqlcode < 0) - fe(ENUM0); - } +if (sqlca.sqlcode < 0) fe ( ENUM0 );} #line 96 "init.pgc" /* exec sql whenever sqlerror do sqlnotice ( NULL , 0 ) ; */ #line 97 "init.pgc" - - { - ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); + + { ECPGdo(__LINE__, 0, 1, NULL, "select now () ", ECPGt_EOIT, ECPGt_EORT); #line 98 "init.pgc" - if (sqlca.sqlcode < 0) - sqlnotice(NULL, 0); - } +if (sqlca.sqlcode < 0) sqlnotice ( NULL , 0 );} #line 98 "init.pgc" return 0; diff --git a/src/interfaces/ecpg/test/expected/preproc-type.c b/src/interfaces/ecpg/test/expected/preproc-type.c index fc9334b8c1..20e937188c 100644 --- a/src/interfaces/ecpg/test/expected/preproc-type.c +++ b/src/interfaces/ecpg/test/expected/preproc-type.c @@ -21,164 +21,150 @@ #line 4 "type.pgc" -typedef long mmInteger; +typedef long mmInteger ; #line 6 "type.pgc" #line 6 "type.pgc" -typedef char mmChar; +typedef char mmChar ; #line 7 "type.pgc" #line 7 "type.pgc" -typedef short mmSmallInt; +typedef short mmSmallInt ; #line 8 "type.pgc" #line 8 "type.pgc" -/* exec sql type string is char [ 11 ] */ +/* exec sql type string is char [ 11 ] */ #line 10 "type.pgc" typedef char string[11]; -/* exec sql type c is char reference */ +/* exec sql type c is char reference */ #line 13 "type.pgc" -typedef char *c; +typedef char* c; /* exec sql begin declare section */ + + + + - - - - -struct TBempl -{ +struct TBempl { #line 19 "type.pgc" - mmInteger idnum; - + mmInteger idnum ; + #line 20 "type.pgc" - mmChar name[21]; - + mmChar name [ 21 ] ; + #line 21 "type.pgc" - mmSmallInt accs; -}; /* exec sql end declare section */ - + mmSmallInt accs ; + } ;/* exec sql end declare section */ #line 23 "type.pgc" int -main(void) +main (void) { - /* exec sql begin declare section */ - - - - - - - - - + /* exec sql begin declare section */ + + + + + + + + + #line 29 "type.pgc" - struct TBempl empl; - + struct TBempl empl ; + #line 30 "type.pgc" - string str; - + string str ; + #line 31 "type.pgc" - c ptr = NULL; - + c ptr = NULL ; + #line 36 "type.pgc" - struct varchar_vc - { + struct varchar_vc { #line 34 "type.pgc" - int len; - + int len ; + #line 35 "type.pgc" - char text [10]; - } vc; - + char text [ 10 ] ; + } vc ; /* exec sql end declare section */ #line 37 "type.pgc" - /* exec sql var vc is [ 10 ] */ + /* exec sql var vc is [ 10 ] */ #line 39 "type.pgc" - ECPGdebug(1, stderr); + ECPGdebug (1, stderr); - empl.idnum = 1; - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); - } + empl.idnum = 1; + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); } #line 43 "type.pgc" - if (sqlca.sqlcode) - { - printf("connect error = %ld\n", sqlca.sqlcode); - exit(sqlca.sqlcode); - } + if (sqlca.sqlcode) + { + printf ("connect error = %ld\n", sqlca.sqlcode); + exit (sqlca.sqlcode); + } - { - ECPGdo(__LINE__, 0, 1, NULL, "create table empl ( idnum integer , name char ( 20 ) , accs smallint , string1 char ( 10 ) , string2 char ( 10 ) , string3 char ( 10 ) ) ", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "create table empl ( idnum integer , name char ( 20 ) , accs smallint , string1 char ( 10 ) , string2 char ( 10 ) , string3 char ( 10 ) ) ", ECPGt_EOIT, ECPGt_EORT);} #line 51 "type.pgc" - if (sqlca.sqlcode) - { - printf("create error = %ld\n", sqlca.sqlcode); - exit(sqlca.sqlcode); - } + if (sqlca.sqlcode) + { + printf ("create error = %ld\n", sqlca.sqlcode); + exit (sqlca.sqlcode); + } - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into empl values ( 1 , 'user name' , 320 , 'first str' , 'second str' , 'third str' ) ", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "insert into empl values ( 1 , 'user name' , 320 , 'first str' , 'second str' , 'third str' ) ", ECPGt_EOIT, ECPGt_EORT);} #line 58 "type.pgc" - if (sqlca.sqlcode) - { - printf("insert error = %ld\n", sqlca.sqlcode); - exit(sqlca.sqlcode); - } - - { - ECPGdo(__LINE__, 0, 1, NULL, "select idnum , name , accs , string1 , string2 , string3 from empl where idnum = ? ", - ECPGt_long, &(empl.idnum), (long) 1, (long) 1, sizeof(long), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, - ECPGt_long, &(empl.idnum), (long) 1, (long) 1, sizeof(long), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, &(empl.name), (long) 21, (long) 1, (21) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_short, &(empl.accs), (long) 1, (long) 1, sizeof(short), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (str), (long) 11, (long) 1, (11) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, &(ptr), (long) 0, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_varchar, &(vc), (long) 10, (long) 1, sizeof(struct varchar_vc), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + if (sqlca.sqlcode) + { + printf ("insert error = %ld\n", sqlca.sqlcode); + exit (sqlca.sqlcode); + } + + { ECPGdo(__LINE__, 0, 1, NULL, "select idnum , name , accs , string1 , string2 , string3 from empl where idnum = ? ", + ECPGt_long,&(empl.idnum),(long)1,(long)1,sizeof(long), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, + ECPGt_long,&(empl.idnum),(long)1,(long)1,sizeof(long), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,&(empl.name),(long)21,(long)1,(21)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_short,&(empl.accs),(long)1,(long)1,sizeof(short), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(str),(long)11,(long)1,(11)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,&(ptr),(long)0,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_varchar,&(vc),(long)10,(long)1,sizeof(struct varchar_vc), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 68 "type.pgc" - if (sqlca.sqlcode) - { - printf("select error = %ld\n", sqlca.sqlcode); - exit(sqlca.sqlcode); - } - printf("id=%ld name='%s' accs=%d str='%s' ptr='%s' vc='%10.10s'\n", empl.idnum, empl.name, empl.accs, str, ptr, vc.text); + if (sqlca.sqlcode) + { + printf ("select error = %ld\n", sqlca.sqlcode); + exit (sqlca.sqlcode); + } + printf ("id=%ld name='%s' accs=%d str='%s' ptr='%s' vc='%10.10s'\n", empl.idnum, empl.name, empl.accs, str, ptr, vc.text); - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 76 "type.pgc" - free(ptr); - exit(0); + free(ptr); + exit (0); } diff --git a/src/interfaces/ecpg/test/expected/preproc-variable.c b/src/interfaces/ecpg/test/expected/preproc-variable.c index 83761b1f96..3781992747 100644 --- a/src/interfaces/ecpg/test/expected/preproc-variable.c +++ b/src/interfaces/ecpg/test/expected/preproc-variable.c @@ -25,245 +25,197 @@ #line 6 "variable.pgc" -/* exec sql type c is char reference */ +/* exec sql type c is char reference */ #line 8 "variable.pgc" -typedef char *c; +typedef char* c; -/* exec sql type ind is union { +/* exec sql type ind is union { #line 11 "variable.pgc" - int integer ; - + int integer ; + #line 11 "variable.pgc" - short smallint ; - } */ + short smallint ; + } */ #line 11 "variable.pgc" -typedef union -{ - int integer; - short smallint; -} ind; +typedef union { int integer; short smallint; } ind; #define BUFFERSIZ 8 -/* exec sql type str is [ BUFFERSIZ ] */ +/* exec sql type str is [ BUFFERSIZ ] */ #line 15 "variable.pgc" -/* declare cur cursor for select name , born , age , married , children from family */ +/* declare cur cursor for select name , born , age , married , children from family */ #line 18 "variable.pgc" int -main(void) +main (void) { - struct birthinfo - { + struct birthinfo { #line 23 "variable.pgc" - long born; - + long born ; + #line 23 "variable.pgc" - short age; - }; - + short age ; + } ; #line 23 "variable.pgc" /* exec sql begin declare section */ - - - - - - - + + + + + + + #line 27 "variable.pgc" - struct personal_struct - { + struct personal_struct { #line 25 "variable.pgc" - struct varchar_name - { - int len; - char arr[BUFFERSIZ]; - } name; - + struct varchar_name { int len; char arr[ BUFFERSIZ ]; } name ; + #line 26 "variable.pgc" - struct birthinfo birth; - } personal, *p; - + struct birthinfo birth ; + } personal , * p ; + #line 30 "variable.pgc" - struct personal_indicator - { + struct personal_indicator { #line 28 "variable.pgc" - int ind_name; - + int ind_name ; + #line 29 "variable.pgc" - struct birthinfo ind_birth; - } ind_personal, *i; - + struct birthinfo ind_birth ; + } ind_personal , * i ; + #line 31 "variable.pgc" - ind ind_children; - + ind ind_children ; /* exec sql end declare section */ #line 32 "variable.pgc" - + #line 34 "variable.pgc" - char *married = NULL; + char * married = NULL ; #line 34 "variable.pgc" - + #line 35 "variable.pgc" - long ind_married; + long ind_married ; #line 35 "variable.pgc" - + #line 36 "variable.pgc" - ind children; + ind children ; #line 36 "variable.pgc" - char msg[128]; + char msg[128]; - ECPGdebug(1, stderr); + ECPGdebug(1, stderr); strcpy(msg, "connect"); - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); #line 43 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 43 "variable.pgc" strcpy(msg, "set"); - { - ECPGdo(__LINE__, 0, 1, NULL, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT); #line 46 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 46 "variable.pgc" strcpy(msg, "create"); - { - ECPGdo(__LINE__, 0, 1, NULL, "create table family ( name char ( 8 ) , born integer , age smallint , married date , children integer ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table family ( name char ( 8 ) , born integer , age smallint , married date , children integer ) ", ECPGt_EOIT, ECPGt_EORT); #line 49 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 49 "variable.pgc" strcpy(msg, "insert"); - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name , married , children ) values ( 'Mum' , '19870714' , 3 ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name , married , children ) values ( 'Mum' , '19870714' , 3 ) ", ECPGt_EOIT, ECPGt_EORT); #line 52 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 52 "variable.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name , born , married , children ) values ( 'Dad' , '19610721' , '19870714' , 3 ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name , born , married , children ) values ( 'Dad' , '19610721' , '19870714' , 3 ) ", ECPGt_EOIT, ECPGt_EORT); #line 53 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 53 "variable.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name , age ) values ( 'Child 1' , 16 ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name , age ) values ( 'Child 1' , 16 ) ", ECPGt_EOIT, ECPGt_EORT); #line 54 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 54 "variable.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name , age ) values ( 'Child 2' , 14 ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name , age ) values ( 'Child 2' , 14 ) ", ECPGt_EOIT, ECPGt_EORT); #line 55 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 55 "variable.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name , age ) values ( 'Child 3' , 9 ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name , age ) values ( 'Child 3' , 9 ) ", ECPGt_EOIT, ECPGt_EORT); #line 56 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 56 "variable.pgc" strcpy(msg, "commit"); - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 59 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 59 "variable.pgc" strcpy(msg, "open"); - { - ECPGdo(__LINE__, 0, 1, NULL, "declare cur cursor for select name , born , age , married , children from family ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "declare cur cursor for select name , born , age , married , children from family ", ECPGt_EOIT, ECPGt_EORT); #line 62 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 62 "variable.pgc" - /* exec sql whenever not found break ; */ + /* exec sql whenever not found break ; */ #line 64 "variable.pgc" - p = &personal; - i = &ind_personal; + p=&personal; + i=&ind_personal; memset(i, 0, sizeof(ind_personal)); - while (1) - { + while (1) { strcpy(msg, "fetch"); - { - ECPGdo(__LINE__, 0, 1, NULL, "fetch cur", ECPGt_EOIT, - ECPGt_varchar, &(p->name), (long) BUFFERSIZ, (long) 1, sizeof(struct varchar_name), - ECPGt_int, &(i->ind_name), (long) 1, (long) 1, sizeof(int), - ECPGt_long, &(p->birth.born), (long) 1, (long) 1, sizeof(long), - ECPGt_long, &(i->ind_birth.born), (long) 1, (long) 1, sizeof(long), - ECPGt_short, &(p->birth.age), (long) 1, (long) 1, sizeof(short), - ECPGt_short, &(i->ind_birth.age), (long) 1, (long) 1, sizeof(short), - ECPGt_char, &(married), (long) 0, (long) 1, (1) * sizeof(char), - ECPGt_long, &(ind_married), (long) 1, (long) 1, sizeof(long), - ECPGt_int, &(children.integer), (long) 1, (long) 1, sizeof(int), - ECPGt_short, &(ind_children.smallint), (long) 1, (long) 1, sizeof(short), ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "fetch cur", ECPGt_EOIT, + ECPGt_varchar,&(p->name),(long)BUFFERSIZ,(long)1,sizeof(struct varchar_name), + ECPGt_int,&(i->ind_name),(long)1,(long)1,sizeof(int), + ECPGt_long,&(p->birth.born),(long)1,(long)1,sizeof(long), + ECPGt_long,&(i->ind_birth.born),(long)1,(long)1,sizeof(long), + ECPGt_short,&(p->birth.age),(long)1,(long)1,sizeof(short), + ECPGt_short,&(i->ind_birth.age),(long)1,(long)1,sizeof(short), + ECPGt_char,&(married),(long)0,(long)1,(1)*sizeof(char), + ECPGt_long,&(ind_married),(long)1,(long)1,sizeof(long), + ECPGt_int,&(children.integer),(long)1,(long)1,sizeof(int), + ECPGt_short,&(ind_children.smallint),(long)1,(long)1,sizeof(short), ECPGt_EORT); #line 71 "variable.pgc" - if (sqlca.sqlcode == ECPG_NOT_FOUND) - break; +if (sqlca.sqlcode == ECPG_NOT_FOUND) break; #line 71 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 71 "variable.pgc" printf("%8.8s", personal.name.arr); @@ -282,46 +234,34 @@ main(void) } 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 88 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 88 "variable.pgc" strcpy(msg, "drop"); - { - ECPGdo(__LINE__, 0, 1, NULL, "drop table family ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "drop table family ", ECPGt_EOIT, ECPGt_EORT); #line 91 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 91 "variable.pgc" strcpy(msg, "commit"); - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 94 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 94 "variable.pgc" - strcpy(msg, "disconnect"); - { - ECPGdisconnect(__LINE__, "CURRENT"); + strcpy(msg, "disconnect"); + { ECPGdisconnect(__LINE__, "CURRENT"); #line 97 "variable.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 97 "variable.pgc" diff --git a/src/interfaces/ecpg/test/expected/preproc-whenever.c b/src/interfaces/ecpg/test/expected/preproc-whenever.c index 270287624d..79983ce2f3 100644 --- a/src/interfaces/ecpg/test/expected/preproc-whenever.c +++ b/src/interfaces/ecpg/test/expected/preproc-whenever.c @@ -24,288 +24,221 @@ #line 5 "whenever.pgc" -static void -print(char *msg) +static void print(char *msg) { - fprintf(stderr, "Error in statement '%s':\n", msg); - sqlprint(); + fprintf(stderr, "Error in statement '%s':\n", msg); + sqlprint(); } -static void -print2(void) +static void print2(void) { - fprintf(stderr, "Found another error\n"); - sqlprint(); + fprintf(stderr, "Found another error\n"); + sqlprint(); } -static void -warn(void) +static void warn(void) { - fprintf(stderr, "Warning: At least one column was truncated\n"); + fprintf(stderr, "Warning: At least one column was truncated\n"); } -int -main(void) +int main(void) { - + #line 26 "whenever.pgc" - int i; + int i ; #line 26 "whenever.pgc" - + #line 27 "whenever.pgc" - char c[6]; + char c [ 6 ] ; #line 27 "whenever.pgc" ECPGdebug(1, stderr); - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); #line 31 "whenever.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 31 "whenever.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test ( i int , c char ( 10 ) ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table test ( i int , c char ( 10 ) ) ", ECPGt_EOIT, ECPGt_EORT); #line 32 "whenever.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 32 "whenever.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test values ( 1 , 'abcdefghij' ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values ( 1 , 'abcdefghij' ) ", ECPGt_EOIT, ECPGt_EORT); #line 33 "whenever.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 33 "whenever.pgc" /* exec sql whenever sql_warning do warn ( ) ; */ #line 35 "whenever.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select * from test ", ECPGt_EOIT, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (c), (long) 6, (long) 1, (6) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select * from test ", ECPGt_EOIT, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(c),(long)6,(long)1,(6)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 36 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 36 "whenever.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 36 "whenever.pgc" - { - ECPGtrans(__LINE__, NULL, "rollback"); + { ECPGtrans(__LINE__, NULL, "rollback"); #line 37 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 37 "whenever.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 37 "whenever.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 39 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 39 "whenever.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 39 "whenever.pgc" - { - ECPGtrans(__LINE__, NULL, "rollback"); + { ECPGtrans(__LINE__, NULL, "rollback"); #line 40 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 40 "whenever.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 40 "whenever.pgc" /* exec sql whenever sqlerror do print ( \"select\" ) ; */ #line 42 "whenever.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 43 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 43 "whenever.pgc" - if (sqlca.sqlcode < 0) - print("select"); - } +if (sqlca.sqlcode < 0) print ( "select" );} #line 43 "whenever.pgc" - { - ECPGtrans(__LINE__, NULL, "rollback"); + { ECPGtrans(__LINE__, NULL, "rollback"); #line 44 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 44 "whenever.pgc" - if (sqlca.sqlcode < 0) - print("select"); - } +if (sqlca.sqlcode < 0) print ( "select" );} #line 44 "whenever.pgc" /* exec sql whenever sqlerror call print2 ( ) ; */ #line 46 "whenever.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 47 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 47 "whenever.pgc" - if (sqlca.sqlcode < 0) - print2(); - } +if (sqlca.sqlcode < 0) print2 ( );} #line 47 "whenever.pgc" - { - ECPGtrans(__LINE__, NULL, "rollback"); + { ECPGtrans(__LINE__, NULL, "rollback"); #line 48 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 48 "whenever.pgc" - if (sqlca.sqlcode < 0) - print2(); - } +if (sqlca.sqlcode < 0) print2 ( );} #line 48 "whenever.pgc" /* exec sql whenever sqlerror continue ; */ #line 50 "whenever.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 51 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); - } +if (sqlca.sqlwarn[0] == 'W') warn ( );} #line 51 "whenever.pgc" - { - ECPGtrans(__LINE__, NULL, "rollback"); + { ECPGtrans(__LINE__, NULL, "rollback"); #line 52 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); - } +if (sqlca.sqlwarn[0] == 'W') warn ( );} #line 52 "whenever.pgc" /* exec sql whenever sqlerror goto error ; */ #line 54 "whenever.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 55 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 55 "whenever.pgc" - if (sqlca.sqlcode < 0) - goto error; - } +if (sqlca.sqlcode < 0) goto error;} #line 55 "whenever.pgc" printf("Should not be reachable\n"); -error: - { - ECPGtrans(__LINE__, NULL, "rollback"); + error: + { ECPGtrans(__LINE__, NULL, "rollback"); #line 59 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 59 "whenever.pgc" - if (sqlca.sqlcode < 0) - goto error; - } +if (sqlca.sqlcode < 0) goto error;} #line 59 "whenever.pgc" /* exec sql whenever sqlerror stop ; */ #line 61 "whenever.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select * from nonexistant ", ECPGt_EOIT, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 62 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 62 "whenever.pgc" - if (sqlca.sqlcode < 0) - exit(1); - } +if (sqlca.sqlcode < 0) exit (1);} #line 62 "whenever.pgc" - { - ECPGtrans(__LINE__, NULL, "rollback"); + { ECPGtrans(__LINE__, NULL, "rollback"); #line 63 "whenever.pgc" - if (sqlca.sqlwarn[0] == 'W') - warn(); +if (sqlca.sqlwarn[0] == 'W') warn ( ); #line 63 "whenever.pgc" - if (sqlca.sqlcode < 0) - exit(1); - } +if (sqlca.sqlcode < 0) exit (1);} #line 63 "whenever.pgc" - exit(0); -} + exit (0); +} diff --git a/src/interfaces/ecpg/test/expected/sql-array.c b/src/interfaces/ecpg/test/expected/sql-array.c index 8b7dec49e7..87ec88f985 100644 --- a/src/interfaces/ecpg/test/expected/sql-array.c +++ b/src/interfaces/ecpg/test/expected/sql-array.c @@ -81,6 +81,7 @@ struct sqlca_t *ECPGget_sqlca(void); #ifdef __cplusplus } #endif + #endif #line 7 "array.pgc" @@ -97,34 +98,33 @@ struct sqlca_t *ECPGget_sqlca(void); int -main(void) +main (void) { /* exec sql begin declare section */ - - - - - - + + + + + + #line 14 "array.pgc" - int i = 1; - + int i = 1 ; + #line 15 "array.pgc" - int *did = &i; - + int * did = & i ; + #line 16 "array.pgc" - 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 } ; + #line 17 "array.pgc" - char text [25] = "klmnopqrst"; - + char text [ 25 ] = "klmnopqrst" ; + #line 18 "array.pgc" - char *t = (char *) malloc(11); - + char * t = ( char * ) malloc ( 11 ) ; + #line 19 "array.pgc" - double f; - + double f ; /* exec sql end declare section */ #line 20 "array.pgc" @@ -134,136 +134,103 @@ main(void) ECPGdebug(1, stderr); - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); #line 27 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 27 "array.pgc" - { - ECPGsetcommit(__LINE__, "on", NULL); + { ECPGsetcommit(__LINE__, "on", NULL); #line 29 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 29 "array.pgc" - { - ECPGtrans(__LINE__, NULL, "begin transaction "); + { ECPGtrans(__LINE__, NULL, "begin transaction "); #line 31 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 31 "array.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test ( f float , i int , a int [ 10 ] , text char ( 10 ) ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table test ( f float , i int , a int [ 10 ] , text char ( 10 ) ) ", ECPGt_EOIT, ECPGt_EORT); #line 33 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 33 "array.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text ) values ( 404.90 , 3 , '{0,1,2,3,4,5,6,7,8,9}' , 'abcdefghij' ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text ) values ( 404.90 , 3 , '{0,1,2,3,4,5,6,7,8,9}' , 'abcdefghij' ) ", ECPGt_EOIT, ECPGt_EORT); #line 35 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 35 "array.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text ) values ( 140787.0 , 2 , ? , ? ) ", - ECPGt_int, (a), (long) 1, (long) 10, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (text), (long) 25, (long) 1, (25) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text ) values ( 140787.0 , 2 , ? , ? ) ", + ECPGt_int,(a),(long)1,(long)10,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 37 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 37 "array.pgc" - - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text ) values ( 14.07 , ? , ? , ? ) ", - ECPGt_int, &(did), (long) 1, (long) 0, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, (a), (long) 1, (long) 10, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, &(t), (long) 0, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text ) values ( 14.07 , ? , ? , ? ) ", + ECPGt_int,&(did),(long)1,(long)0,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,(a),(long)1,(long)10,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,&(t),(long)0,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 39 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 39 "array.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 41 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 41 "array.pgc" - { - ECPGtrans(__LINE__, NULL, "begin transaction "); + { ECPGtrans(__LINE__, NULL, "begin transaction "); #line 43 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 43 "array.pgc" + - - { - ECPGdo(__LINE__, 0, 1, NULL, "select f , text from test where i = 1 ", ECPGt_EOIT, - ECPGt_double, &(f), (long) 1, (long) 1, sizeof(double), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (text), (long) 25, (long) 1, (25) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select f , text from test where i = 1 ", ECPGt_EOIT, + ECPGt_double,&(f),(long)1,(long)1,sizeof(double), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 48 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 48 "array.pgc" printf("Found f=%f text=%10.10s\n", f, text); - f = 140787; - { - ECPGdo(__LINE__, 0, 1, NULL, "select a , text from test where f = ? ", - ECPGt_double, &(f), (long) 1, (long) 1, sizeof(double), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, - ECPGt_int, (a), (long) 1, (long) 10, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, &(t), (long) 0, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + f=140787; + { ECPGdo(__LINE__, 0, 1, NULL, "select a , text from test where f = ? ", + ECPGt_double,&(f),(long)1,(long)1,sizeof(double), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, + ECPGt_int,(a),(long)1,(long)10,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,&(t),(long)0,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 56 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 56 "array.pgc" @@ -272,49 +239,37 @@ main(void) printf("Found text=%10.10s\n", t); - { - ECPGdo(__LINE__, 0, 1, NULL, "select a from test where f = ? ", - ECPGt_double, &(f), (long) 1, (long) 1, sizeof(double), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, - ECPGt_char, (text), (long) 25, (long) 1, (25) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select a from test where f = ? ", + ECPGt_double,&(f),(long)1,(long)1,sizeof(double), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, + ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 66 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 66 "array.pgc" printf("Found text=%s\n", text); - { - ECPGdo(__LINE__, 0, 1, NULL, "drop table test ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "drop table test ", ECPGt_EOIT, ECPGt_EORT); #line 70 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 70 "array.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 72 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 72 "array.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); + { ECPGdisconnect(__LINE__, "CURRENT"); #line 74 "array.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 74 "array.pgc" diff --git a/src/interfaces/ecpg/test/expected/sql-binary.c b/src/interfaces/ecpg/test/expected/sql-binary.c index ae444253f7..deb0220d44 100644 --- a/src/interfaces/ecpg/test/expected/sql-binary.c +++ b/src/interfaces/ecpg/test/expected/sql-binary.c @@ -22,174 +22,143 @@ /* exec sql begin declare section */ + + + + + - - - - - -struct TBempl -{ +struct TBempl { #line 9 "binary.pgc" - long idnum; - + long idnum ; + #line 10 "binary.pgc" - char name[21]; - + char name [ 21 ] ; + #line 11 "binary.pgc" - short accs; - + short accs ; + #line 12 "binary.pgc" - char byte[20]; -}; /* exec sql end declare section */ - + char byte [ 20 ] ; + } ;/* exec sql end declare section */ #line 14 "binary.pgc" int -main(void) +main (void) { - /* exec sql begin declare section */ - - - + /* exec sql begin declare section */ + + + #line 20 "binary.pgc" - struct TBempl empl; - + struct TBempl empl ; + #line 21 "binary.pgc" - char *data = "\\001\\155\\000\\212"; - + char * data = "\\001\\155\\000\\212" ; /* exec sql end declare section */ #line 22 "binary.pgc" - int i; + int i; - ECPGdebug(1, stderr); + ECPGdebug (1, stderr); - empl.idnum = 1; - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); - } + empl.idnum = 1; + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); } #line 28 "binary.pgc" - if (sqlca.sqlcode) - { - printf("connect error = %ld\n", sqlca.sqlcode); - exit(sqlca.sqlcode); - } + if (sqlca.sqlcode) + { + printf ("connect error = %ld\n", sqlca.sqlcode); + exit (sqlca.sqlcode); + } - { - ECPGdo(__LINE__, 0, 1, NULL, "create table empl ( idnum integer , name char ( 20 ) , accs smallint , byte bytea ) ", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "create table empl ( idnum integer , name char ( 20 ) , accs smallint , byte bytea ) ", ECPGt_EOIT, ECPGt_EORT);} #line 36 "binary.pgc" - if (sqlca.sqlcode) - { - printf("create error = %ld\n", sqlca.sqlcode); - exit(sqlca.sqlcode); - } - - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into empl values ( 1 , 'first user' , 320 , ? ) ", - ECPGt_char, &(data), (long) 0, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); - } + if (sqlca.sqlcode) + { + printf ("create error = %ld\n", sqlca.sqlcode); + exit (sqlca.sqlcode); + } + + { ECPGdo(__LINE__, 0, 1, NULL, "insert into empl values ( 1 , 'first user' , 320 , ? ) ", + ECPGt_char,&(data),(long)0,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);} #line 43 "binary.pgc" - if (sqlca.sqlcode) - { - printf("insert error = %ld\n", sqlca.sqlcode); - exit(sqlca.sqlcode); - } + if (sqlca.sqlcode) + { + printf ("insert error = %ld\n", sqlca.sqlcode); + exit (sqlca.sqlcode); + } - /* - * declare C cursor for select name , accs , byte from empl where - * idnum = ? - */ + /* declare C cursor for select name , accs , byte from empl where idnum = ? */ #line 50 "binary.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "declare C cursor for select name , accs , byte from empl where idnum = ? ", - ECPGt_long, &(empl.idnum), (long) 1, (long) 1, sizeof(long), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "declare C cursor for select name , accs , byte from empl where idnum = ? ", + ECPGt_long,&(empl.idnum),(long)1,(long)1,sizeof(long), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);} #line 51 "binary.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "fetch C", ECPGt_EOIT, - ECPGt_char, (empl.name), (long) 21, (long) 1, (21) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_short, &(empl.accs), (long) 1, (long) 1, sizeof(short), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (empl.byte), (long) 20, (long) 1, (20) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "fetch C", ECPGt_EOIT, + ECPGt_char,(empl.name),(long)21,(long)1,(21)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_short,&(empl.accs),(long)1,(long)1,sizeof(short), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(empl.byte),(long)20,(long)1,(20)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 52 "binary.pgc" - if (sqlca.sqlcode) - { - printf("fetch error = %ld\n", sqlca.sqlcode); - exit(sqlca.sqlcode); - } - - printf("name=%s, accs=%d byte=%s\n", empl.name, empl.accs, empl.byte); + if (sqlca.sqlcode) + { + printf ("fetch error = %ld\n", sqlca.sqlcode); + exit (sqlca.sqlcode); + } - memset(empl.name, 0, 21L); - memset(empl.byte, '#', 20L); + printf ("name=%s, accs=%d byte=%s\n", empl.name, empl.accs, empl.byte); - /* - * declare B binary cursor for select name , accs , byte from empl - * where idnum = ? - */ + memset(empl.name, 0, 21L); + memset(empl.byte, '#', 20L); + /* declare B binary cursor for select name , accs , byte from empl where idnum = ? */ #line 63 "binary.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "declare B binary cursor for select name , accs , byte from empl where idnum = ? ", - ECPGt_long, &(empl.idnum), (long) 1, (long) 1, sizeof(long), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "declare B binary cursor for select name , accs , byte from empl where idnum = ? ", + ECPGt_long,&(empl.idnum),(long)1,(long)1,sizeof(long), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);} #line 64 "binary.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "fetch B", ECPGt_EOIT, - ECPGt_char, (empl.name), (long) 21, (long) 1, (21) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_short, &(empl.accs), (long) 1, (long) 1, sizeof(short), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (empl.byte), (long) 20, (long) 1, (20) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "fetch B", ECPGt_EOIT, + ECPGt_char,(empl.name),(long)21,(long)1,(21)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_short,&(empl.accs),(long)1,(long)1,sizeof(short), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(empl.byte),(long)20,(long)1,(20)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 65 "binary.pgc" - if (sqlca.sqlcode) - { - printf("fetch error = %ld\n", sqlca.sqlcode); - exit(sqlca.sqlcode); - } + if (sqlca.sqlcode) + { + printf ("fetch error = %ld\n", sqlca.sqlcode); + exit (sqlca.sqlcode); + } - { - ECPGdo(__LINE__, 0, 1, NULL, "close B", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "close B", ECPGt_EOIT, ECPGt_EORT);} #line 72 "binary.pgc" - /* - * do not print a.accs because big/little endian will have different - * outputs here - */ - printf("name=%s, byte=", empl.name); - for (i = 0; i < 20; i++) - { - if (empl.byte[i] == '#') - break; - printf("(%o)", (unsigned char) empl.byte[i]); - } - printf("\n"); - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + /* do not print a.accs because big/little endian will have different outputs here */ + printf ("name=%s, byte=", empl.name); + for (i=0; i<20; i++) + { + if (empl.byte[i] == '#') + break; + printf("(%o)", (unsigned char)empl.byte[i]); + } + printf("\n"); + { ECPGdisconnect(__LINE__, "CURRENT");} #line 83 "binary.pgc" - exit(0); + exit (0); } diff --git a/src/interfaces/ecpg/test/expected/sql-code100.c b/src/interfaces/ecpg/test/expected/sql-code100.c index 036672ff23..2365a27e4e 100644 --- a/src/interfaces/ecpg/test/expected/sql-code100.c +++ b/src/interfaces/ecpg/test/expected/sql-code100.c @@ -73,6 +73,7 @@ struct sqlca_t *ECPGget_sqlca(void); #ifdef __cplusplus } #endif + #endif #line 1 "code100.pgc" @@ -91,109 +92,73 @@ struct sqlca_t *ECPGget_sqlca(void); -int -main(int argc, char **argv) -{ /* exec sql begin declare section */ - - +int main(int argc, char **argv) +{ /* exec sql begin declare section */ + + #line 9 "code100.pgc" - int index; - + int index ; /* exec sql end declare section */ #line 10 "code100.pgc" - ECPGdebug(1, stderr); - - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); - } + ECPGdebug(1,stderr); + + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); } #line 15 "code100.pgc" - if (sqlca.sqlcode) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); + if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test ( \"index\" numeric ( 3 ) primary key , \"payload\" int4 not null ) ", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "create table test ( \"index\" numeric ( 3 ) primary key , \"payload\" int4 not null ) ", ECPGt_EOIT, ECPGt_EORT);} #line 20 "code100.pgc" - if (sqlca.sqlcode) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); - { - ECPGtrans(__LINE__, NULL, "commit"); - } + if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + { ECPGtrans(__LINE__, NULL, "commit");} #line 22 "code100.pgc" - if (sqlca.sqlcode) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); - - for (index = 0; index < 10; ++index) - { - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( payload , index ) values( 0 , ? ) ", - ECPGt_int, &(index), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); - } + if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + + for (index=0;index<10;++index) + { { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( payload , index ) values ( 0 , ? ) ", + ECPGt_int,&(index),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);} #line 28 "code100.pgc" - if (sqlca.sqlcode) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); - } - { - ECPGtrans(__LINE__, NULL, "commit"); - } + if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + } + { ECPGtrans(__LINE__, NULL, "commit");} #line 31 "code100.pgc" - if (sqlca.sqlcode) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); - - { - ECPGdo(__LINE__, 0, 1, NULL, "update test set payload = payload + 1 where index = - 1 ", ECPGt_EOIT, ECPGt_EORT); - } + if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + + { ECPGdo(__LINE__, 0, 1, NULL, "update test set payload = payload + 1 where index = - 1 ", ECPGt_EOIT, ECPGt_EORT);} #line 35 "code100.pgc" - if (sqlca.sqlcode != 100) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); - - { - ECPGdo(__LINE__, 0, 1, NULL, "delete from test where index = - 1 ", ECPGt_EOIT, ECPGt_EORT); - } + if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + + { ECPGdo(__LINE__, 0, 1, NULL, "delete from test where index = - 1 ", ECPGt_EOIT, ECPGt_EORT);} #line 38 "code100.pgc" - if (sqlca.sqlcode != 100) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); + if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( select * from test where index = - 1 ) ", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( select * from test where index = - 1 ) ", ECPGt_EOIT, ECPGt_EORT);} #line 41 "code100.pgc" - if (sqlca.sqlcode != 100) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); + if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - { - ECPGdo(__LINE__, 0, 1, NULL, "drop table test ", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "drop table test ", ECPGt_EOIT, ECPGt_EORT);} #line 44 "code100.pgc" - if (sqlca.sqlcode) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); - { - ECPGtrans(__LINE__, NULL, "commit"); - } + if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + { ECPGtrans(__LINE__, NULL, "commit");} #line 46 "code100.pgc" - if (sqlca.sqlcode) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); - - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + + { ECPGdisconnect(__LINE__, "CURRENT");} #line 49 "code100.pgc" - if (sqlca.sqlcode) - printf("%ld:%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc); - return 0; + if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + return 0; } diff --git a/src/interfaces/ecpg/test/expected/sql-copystdout.c b/src/interfaces/ecpg/test/expected/sql-copystdout.c index 83444f801b..f77fe1d2bd 100644 --- a/src/interfaces/ecpg/test/expected/sql-copystdout.c +++ b/src/interfaces/ecpg/test/expected/sql-copystdout.c @@ -75,6 +75,7 @@ struct sqlca_t *ECPGget_sqlca(void); #ifdef __cplusplus } #endif + #endif #line 3 "copystdout.pgc" @@ -95,7 +96,7 @@ struct sqlca_t *ECPGget_sqlca(void); int -main() +main () { /* EXEC SQL BEGIN DECLARE SECTION; @@ -103,78 +104,57 @@ main() EXEC SQL END DECLARE SECTION; */ - ECPGdebug(1, stderr); + ECPGdebug (1, stderr); - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); #line 19 "copystdout.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 19 "copystdout.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table foo ( a int , b varchar ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table foo ( a int , b varchar ) ", ECPGt_EOIT, ECPGt_EORT); #line 20 "copystdout.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 20 "copystdout.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into foo values( 5 , 'abc' ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into foo values ( 5 , 'abc' ) ", ECPGt_EOIT, ECPGt_EORT); #line 21 "copystdout.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 21 "copystdout.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into foo values( 6 , 'def' ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into foo values ( 6 , 'def' ) ", ECPGt_EOIT, ECPGt_EORT); #line 22 "copystdout.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 22 "copystdout.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into foo values( 7 , 'ghi' ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into foo values ( 7 , 'ghi' ) ", ECPGt_EOIT, ECPGt_EORT); #line 23 "copystdout.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 23 "copystdout.pgc" - /* produces expected file "/tmp/foo" */ - /* EXEC SQL COPY foo TO:fname WITH DELIMITER ','; */ - /* printf ("copy to /tmp/foo : sqlca.sqlcode = %ld", sqlca.sqlcode); */ + /* produces expected file "/tmp/foo" */ + /* EXEC SQL COPY foo TO:fname WITH DELIMITER ','; */ + /* printf ("copy to /tmp/foo : sqlca.sqlcode = %ld", sqlca.sqlcode); */ - { - ECPGdo(__LINE__, 0, 1, NULL, "copy foo to stdout with delimiter ','", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "copy foo to stdout with delimiter ','", ECPGt_EOIT, ECPGt_EORT); #line 29 "copystdout.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 29 "copystdout.pgc" - printf("copy to STDOUT : sqlca.sqlcode = %ld\n", sqlca.sqlcode); + printf ("copy to STDOUT : sqlca.sqlcode = %ld\n", sqlca.sqlcode); - { - ECPGdisconnect(__LINE__, "CURRENT"); + { ECPGdisconnect(__LINE__, "CURRENT"); #line 32 "copystdout.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 32 "copystdout.pgc" - return 0; + return 0; } diff --git a/src/interfaces/ecpg/test/expected/sql-define.c b/src/interfaces/ecpg/test/expected/sql-define.c index ed8dfb5681..985cd1dfc2 100644 --- a/src/interfaces/ecpg/test/expected/sql-define.c +++ b/src/interfaces/ecpg/test/expected/sql-define.c @@ -73,6 +73,7 @@ struct sqlca_t *ECPGget_sqlca(void); #ifdef __cplusplus } #endif + #endif #line 1 "define.pgc" @@ -91,143 +92,114 @@ struct sqlca_t *ECPGget_sqlca(void); -int -main(void) +int main(void) { - /* exec sql begin declare section */ - - - + /* exec sql begin declare section */ + + + #line 10 "define.pgc" - int i; - + int i ; + #line 11 "define.pgc" - char s[200]; - + char s [ 200 ] ; /* exec sql end declare section */ #line 12 "define.pgc" - ECPGdebug(1, stderr); + ECPGdebug(1, stderr); - /* exec sql whenever sqlerror do sqlprint ( ) ; */ + /* exec sql whenever sqlerror do sqlprint ( ) ; */ #line 16 "define.pgc" - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); #line 17 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 17 "define.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test ( a int , b text ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table test ( a int , b text ) ", ECPGt_EOIT, ECPGt_EORT); #line 19 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 19 "define.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( 29 , 'abcdef' ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values ( 29 , 'abcdef' ) ", ECPGt_EOIT, ECPGt_EORT); #line 20 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 20 "define.pgc" - - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( null , 'defined' ) ", ECPGt_EOIT, ECPGt_EORT); + + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values ( null , 'defined' ) ", ECPGt_EOIT, ECPGt_EORT); #line 23 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 23 "define.pgc" + - - - - - - - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( null , 'someothervar not defined' ) ", ECPGt_EOIT, ECPGt_EORT); + + + + + + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values ( null , 'someothervar not defined' ) ", ECPGt_EOIT, ECPGt_EORT); #line 31 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 31 "define.pgc" + + - - - { - ECPGdo(__LINE__, 0, 1, NULL, "select 1 , 29 :: text || '-' || 'abcdef' ", ECPGt_EOIT, - ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (s), (long) 200, (long) 1, (200) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select 1 , 29 :: text || '-' || 'abcdef' ", ECPGt_EOIT, + ECPGt_int,&(i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(s),(long)200,(long)1,(200)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 36 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 36 "define.pgc" - printf("i: %d, s: %s\n", i, s); - + printf("i: %d, s: %s\n", i, s); - - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( 29 , 'no string' ) ", ECPGt_EOIT, ECPGt_EORT); + + + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values ( 29 , 'no string' ) ", ECPGt_EOIT, ECPGt_EORT); #line 42 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 42 "define.pgc" + + /* no value */ + - /* no value */ - - - - - - - - { - ECPGdo(__LINE__, 0, 1, NULL, "set TIMEZONE to 'UTC'", ECPGt_EOIT, ECPGt_EORT); + + + + + + { ECPGdo(__LINE__, 0, 1, NULL, "set TIMEZONE to 'UTC'", ECPGt_EOIT, ECPGt_EORT); #line 53 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 53 "define.pgc" + - - { - ECPGdisconnect(__LINE__, "CURRENT"); + { ECPGdisconnect(__LINE__, "CURRENT"); #line 56 "define.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 56 "define.pgc" - return 0; + return 0; } diff --git a/src/interfaces/ecpg/test/expected/sql-desc.c b/src/interfaces/ecpg/test/expected/sql-desc.c index c54e67ee7e..d1c776fca1 100644 --- a/src/interfaces/ecpg/test/expected/sql-desc.c +++ b/src/interfaces/ecpg/test/expected/sql-desc.c @@ -25,43 +25,39 @@ int main(void) { /* exec sql begin declare section */ - - - - - - - - - - + + + + + + + + + + #line 8 "desc.pgc" - char *stmt1 = "INSERT INTO test1 VALUES (?, ?)"; - + char * stmt1 = "INSERT INTO test1 VALUES (?, ?)" ; + #line 9 "desc.pgc" - char *stmt2 = "SELECT * from test1 where a = ? and b = ?"; - + char * stmt2 = "SELECT * from test1 where a = ? and b = ?" ; + #line 10 "desc.pgc" - char *stmt3 = "SELECT * from test1 where a = ?"; - + char * stmt3 = "SELECT * from test1 where a = ?" ; + #line 12 "desc.pgc" - int val1 = 1; - + int val1 = 1 ; + #line 13 "desc.pgc" - char val2[4] = "one", - val2output[] = "AAA"; - + char val2 [ 4 ] = "one" , val2output [] = "AAA" ; + #line 14 "desc.pgc" - int val1output = 2, - val2i = 0; - + int val1output = 2 , val2i = 0 ; + #line 15 "desc.pgc" - int val2null = -1; - + int val2null = - 1 ; + #line 16 "desc.pgc" - int ind1, - ind2; - + int ind1 , ind2 ; /* exec sql end declare section */ #line 17 "desc.pgc" @@ -71,228 +67,172 @@ main(void) ECPGallocate_desc(__LINE__, "indesc"); #line 21 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); +if (sqlca.sqlcode < 0) sqlprint(); #line 21 "desc.pgc" ECPGallocate_desc(__LINE__, "outdesc"); #line 22 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); +if (sqlca.sqlcode < 0) sqlprint(); #line 22 "desc.pgc" - { - ECPGset_desc(__LINE__, "indesc", 1, ECPGd_data, - ECPGt_int, &(val1), (long) 1, (long) 1, sizeof(int), ECPGd_EODT); + { ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data, + ECPGt_int,&(val1),(long)1,(long)1,sizeof(int), ECPGd_EODT); #line 24 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 24 "desc.pgc" - { - ECPGset_desc(__LINE__, "indesc", 2, ECPGd_data, - ECPGt_char, (val2), (long) 4, (long) 1, (4) * sizeof(char), ECPGd_indicator, - ECPGt_int, &(val2i), (long) 1, (long) 1, sizeof(int), ECPGd_EODT); + { ECPGset_desc(__LINE__, "indesc", 2,ECPGd_data, + ECPGt_char,(val2),(long)4,(long)1,(4)*sizeof(char), ECPGd_indicator, + ECPGt_int,&(val2i),(long)1,(long)1,sizeof(int), ECPGd_EODT); #line 25 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 25 "desc.pgc" - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); #line 27 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 27 "desc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test1 ( a int , b text ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table test1 ( a int , b text ) ", ECPGt_EOIT, ECPGt_EORT); #line 29 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 29 "desc.pgc" - { - ECPGprepare(__LINE__, "foo1", stmt1); + { ECPGprepare(__LINE__, "foo1" , stmt1); #line 30 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 30 "desc.pgc" - { - ECPGprepare(__LINE__, "foo2", stmt2); + { ECPGprepare(__LINE__, "foo2" , stmt2); #line 31 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 31 "desc.pgc" - { - ECPGprepare(__LINE__, "foo3", stmt3); + { ECPGprepare(__LINE__, "foo3" , stmt3); #line 32 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 32 "desc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "?", - ECPGt_char_variable, (ECPGprepared_statement("foo1")), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_descriptor, "indesc", 0L, 0L, 0L, - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "?", + ECPGt_char_variable,(ECPGprepared_statement("foo1")),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_descriptor, "indesc", 0L, 0L, 0L, + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 34 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 34 "desc.pgc" - { - ECPGset_desc(__LINE__, "indesc", 1, ECPGd_data, - ECPGt_const, "2", (long) 1, (long) 1, strlen("2"), ECPGd_EODT); + { ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data, + ECPGt_const,"2",(long)1,(long)1,strlen("2"), ECPGd_EODT); #line 36 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 36 "desc.pgc" - { - ECPGset_desc(__LINE__, "indesc", 2, ECPGd_data, - ECPGt_char, (val2), (long) 4, (long) 1, (4) * sizeof(char), ECPGd_indicator, - ECPGt_int, &(val2null), (long) 1, (long) 1, sizeof(int), ECPGd_EODT); + { ECPGset_desc(__LINE__, "indesc", 2,ECPGd_data, + ECPGt_char,(val2),(long)4,(long)1,(4)*sizeof(char), ECPGd_indicator, + ECPGt_int,&(val2null),(long)1,(long)1,sizeof(int), ECPGd_EODT); #line 37 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 37 "desc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "?", - ECPGt_char_variable, (ECPGprepared_statement("foo1")), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_descriptor, "indesc", 0L, 0L, 0L, - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "?", + ECPGt_char_variable,(ECPGprepared_statement("foo1")),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_descriptor, "indesc", 0L, 0L, 0L, + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 39 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 39 "desc.pgc" - { - ECPGset_desc(__LINE__, "indesc", 1, ECPGd_data, - ECPGt_const, "3", (long) 1, (long) 1, strlen("3"), ECPGd_EODT); + { ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data, + ECPGt_const,"3",(long)1,(long)1,strlen("3"), ECPGd_EODT); #line 41 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 41 "desc.pgc" - { - ECPGset_desc(__LINE__, "indesc", 2, ECPGd_data, - ECPGt_const, "this is a long test", (long) 19, (long) 1, strlen("this is a long test"), ECPGd_indicator, - ECPGt_int, &(val1), (long) 1, (long) 1, sizeof(int), ECPGd_EODT); + { ECPGset_desc(__LINE__, "indesc", 2,ECPGd_data, + ECPGt_const,"this is a long test",(long)19,(long)1,strlen("this is a long test"), ECPGd_indicator, + ECPGt_int,&(val1),(long)1,(long)1,sizeof(int), ECPGd_EODT); #line 42 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 42 "desc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "?", - ECPGt_char_variable, (ECPGprepared_statement("foo1")), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_descriptor, "indesc", 0L, 0L, 0L, - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "?", + ECPGt_char_variable,(ECPGprepared_statement("foo1")),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_descriptor, "indesc", 0L, 0L, 0L, + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 44 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 44 "desc.pgc" - { - ECPGset_desc(__LINE__, "indesc", 1, ECPGd_data, - ECPGt_int, &(val1), (long) 1, (long) 1, sizeof(int), ECPGd_EODT); + { ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data, + ECPGt_int,&(val1),(long)1,(long)1,sizeof(int), ECPGd_EODT); #line 46 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 46 "desc.pgc" - { - ECPGset_desc(__LINE__, "indesc", 2, ECPGd_data, - ECPGt_char, (val2), (long) 4, (long) 1, (4) * sizeof(char), ECPGd_indicator, - ECPGt_int, &(val2i), (long) 1, (long) 1, sizeof(int), ECPGd_EODT); + { ECPGset_desc(__LINE__, "indesc", 2,ECPGd_data, + ECPGt_char,(val2),(long)4,(long)1,(4)*sizeof(char), ECPGd_indicator, + ECPGt_int,&(val2i),(long)1,(long)1,sizeof(int), ECPGd_EODT); #line 47 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 47 "desc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "?", - ECPGt_char_variable, (ECPGprepared_statement("foo2")), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_descriptor, "indesc", 0L, 0L, 0L, - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, - ECPGt_descriptor, "outdesc", 0L, 0L, 0L, - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "?", + ECPGt_char_variable,(ECPGprepared_statement("foo2")),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_descriptor, "indesc", 0L, 0L, 0L, + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, + ECPGt_descriptor, "outdesc", 0L, 0L, 0L, + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 49 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 49 "desc.pgc" - { - ECPGget_desc(__LINE__, "outdesc", 1, ECPGd_data, - ECPGt_char, (val2output), (long) sizeof("AAA"), (long) 1, (sizeof("AAA")) *sizeof(char), ECPGd_EODT); + { ECPGget_desc(__LINE__, "outdesc", 1,ECPGd_data, + ECPGt_char,(val2output),(long)sizeof("AAA"),(long)1,(sizeof("AAA"))*sizeof(char), ECPGd_EODT); #line 51 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 51 "desc.pgc" printf("output = %s\n", val2output); @@ -300,156 +240,121 @@ main(void) /* declare c1 cursor for ? */ #line 54 "desc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "declare c1 cursor for ?", - ECPGt_char_variable, (ECPGprepared_statement("foo2")), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_descriptor, "indesc", 0L, 0L, 0L, - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "declare c1 cursor for ?", + ECPGt_char_variable,(ECPGprepared_statement("foo2")),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_descriptor, "indesc", 0L, 0L, 0L, + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 55 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 55 "desc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "fetch next from c1", ECPGt_EOIT, - ECPGt_int, &(val1output), (long) 1, (long) 1, sizeof(int), - ECPGt_int, &(ind1), (long) 1, (long) 1, sizeof(int), - ECPGt_char, (val2output), (long) sizeof("AAA"), (long) 1, (sizeof("AAA")) *sizeof(char), - ECPGt_int, &(ind2), (long) 1, (long) 1, sizeof(int), ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "fetch next from c1", ECPGt_EOIT, + ECPGt_int,&(val1output),(long)1,(long)1,sizeof(int), + ECPGt_int,&(ind1),(long)1,(long)1,sizeof(int), + ECPGt_char,(val2output),(long)sizeof("AAA"),(long)1,(sizeof("AAA"))*sizeof(char), + ECPGt_int,&(ind2),(long)1,(long)1,sizeof(int), ECPGt_EORT); #line 57 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 57 "desc.pgc" printf("val1=%d (ind1: %d) val2=%s (ind2: %d)\n", - val1output, ind1, val2output, ind2); + val1output, ind1, val2output, ind2); - { - ECPGdo(__LINE__, 0, 1, NULL, "close c1", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "close c1", ECPGt_EOIT, ECPGt_EORT); #line 61 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 61 "desc.pgc" - { - ECPGset_desc_header(__LINE__, "indesc", (int) (1)); + { ECPGset_desc_header(__LINE__, "indesc", (int)(1)); #line 63 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 63 "desc.pgc" - { - ECPGset_desc(__LINE__, "indesc", 1, ECPGd_data, - ECPGt_const, "2", (long) 1, (long) 1, strlen("2"), ECPGd_EODT); + { ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data, + ECPGt_const,"2",(long)1,(long)1,strlen("2"), ECPGd_EODT); #line 64 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 64 "desc.pgc" /* declare c2 cursor for ? */ #line 66 "desc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "declare c2 cursor for ?", - ECPGt_char_variable, (ECPGprepared_statement("foo3")), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_descriptor, "indesc", 0L, 0L, 0L, - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "declare c2 cursor for ?", + ECPGt_char_variable,(ECPGprepared_statement("foo3")),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_descriptor, "indesc", 0L, 0L, 0L, + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 67 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 67 "desc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "fetch next from c2", ECPGt_EOIT, - ECPGt_int, &(val1output), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (val2output), (long) sizeof("AAA"), (long) 1, (sizeof("AAA")) *sizeof(char), - ECPGt_int, &(val2i), (long) 1, (long) 1, sizeof(int), ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "fetch next from c2", ECPGt_EOIT, + ECPGt_int,&(val1output),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(val2output),(long)sizeof("AAA"),(long)1,(sizeof("AAA"))*sizeof(char), + ECPGt_int,&(val2i),(long)1,(long)1,sizeof(int), ECPGt_EORT); #line 69 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 69 "desc.pgc" printf("val1=%d val2=%s\n", val1output, val2i ? "null" : val2output); - { - ECPGdo(__LINE__, 0, 1, NULL, "close c2", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "close c2", ECPGt_EOIT, ECPGt_EORT); #line 72 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 72 "desc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select * from test1 where a = 3 ", ECPGt_EOIT, - ECPGt_int, &(val1output), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (val2output), (long) sizeof("AAA"), (long) 1, (sizeof("AAA")) *sizeof(char), - ECPGt_int, &(val2i), (long) 1, (long) 1, sizeof(int), ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select * from test1 where a = 3 ", ECPGt_EOIT, + ECPGt_int,&(val1output),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(val2output),(long)sizeof("AAA"),(long)1,(sizeof("AAA"))*sizeof(char), + ECPGt_int,&(val2i),(long)1,(long)1,sizeof(int), ECPGt_EORT); #line 74 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 74 "desc.pgc" printf("val1=%d val2=%c%c%c%c warn=%c truncate=%d\n", val1output, val2output[0], val2output[1], val2output[2], val2output[3], sqlca.sqlwarn[0], val2i); - { - ECPGdo(__LINE__, 0, 1, NULL, "drop table test1 ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "drop table test1 ", ECPGt_EOIT, ECPGt_EORT); #line 77 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 77 "desc.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); + { ECPGdisconnect(__LINE__, "CURRENT"); #line 78 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 78 "desc.pgc" ECPGdeallocate_desc(__LINE__, "indesc"); #line 80 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); +if (sqlca.sqlcode < 0) sqlprint(); #line 80 "desc.pgc" ECPGdeallocate_desc(__LINE__, "outdesc"); #line 81 "desc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); +if (sqlca.sqlcode < 0) sqlprint(); #line 81 "desc.pgc" diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc.c b/src/interfaces/ecpg/test/expected/sql-dynalloc.c index ac6e722af1..9cf471bea7 100644 --- a/src/interfaces/ecpg/test/expected/sql-dynalloc.c +++ b/src/interfaces/ecpg/test/expected/sql-dynalloc.c @@ -74,6 +74,7 @@ struct sqlca_t *ECPGget_sqlca(void); #ifdef __cplusplus } #endif + #endif #line 2 "dynalloc.pgc" @@ -90,315 +91,250 @@ struct sqlca_t *ECPGget_sqlca(void); #line 4 "dynalloc.pgc" -int -main(void) +int main(void) { - /* exec sql begin declare section */ - - - - - - - -/* char **d8=0; */ - - - - - - - - -/* int *i8=0; */ - - + /* exec sql begin declare section */ + + + + + + + +/* char **d8=0; */ + + + + + + + + +/* int *i8=0; */ + + #line 9 "dynalloc.pgc" - int *d1 = 0; - + int * d1 = 0 ; + #line 10 "dynalloc.pgc" - double *d2 = 0; - + double * d2 = 0 ; + #line 11 "dynalloc.pgc" - char **d3 = 0; - + char ** d3 = 0 ; + #line 12 "dynalloc.pgc" - char **d4 = 0; - + char ** d4 = 0 ; + #line 13 "dynalloc.pgc" - char **d5 = 0; - + char ** d5 = 0 ; + #line 14 "dynalloc.pgc" - char **d6 = 0; - + char ** d6 = 0 ; + #line 15 "dynalloc.pgc" - char **d7 = 0; - + char ** d7 = 0 ; + #line 17 "dynalloc.pgc" - char **d9 = 0; - + char ** d9 = 0 ; + #line 18 "dynalloc.pgc" - int *i1 = 0; - + int * i1 = 0 ; + #line 19 "dynalloc.pgc" - int *i2 = 0; - + int * i2 = 0 ; + #line 20 "dynalloc.pgc" - int *i3 = 0; - + int * i3 = 0 ; + #line 21 "dynalloc.pgc" - int *i4 = 0; - + int * i4 = 0 ; + #line 22 "dynalloc.pgc" - int *i5 = 0; - + int * i5 = 0 ; + #line 23 "dynalloc.pgc" - int *i6 = 0; - + int * i6 = 0 ; + #line 24 "dynalloc.pgc" - int *i7 = 0; - + int * i7 = 0 ; + #line 26 "dynalloc.pgc" - int *i9 = 0; - + int * i9 = 0 ; /* exec sql end declare section */ #line 27 "dynalloc.pgc" - int i; + int i; - ECPGdebug(1, stderr); + ECPGdebug(1, stderr); - /* exec sql whenever sqlerror do sqlprint ( ) ; */ + /* exec sql whenever sqlerror do sqlprint ( ) ; */ #line 32 "dynalloc.pgc" - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); #line 33 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 33 "dynalloc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "set datestyle to mdy", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "set datestyle to mdy", ECPGt_EOIT, ECPGt_EORT); #line 35 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 35 "dynalloc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test ( a serial , b numeric ( 12 , 3 ) , c varchar , d varchar ( 3 ) , e char ( 4 ) , f timestamptz , g boolean , h box , i inet ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table test ( a serial , b numeric ( 12 , 3 ) , c varchar , d varchar ( 3 ) , e char ( 4 ) , f timestamptz , g boolean , h box , i inet ) ", ECPGt_EOIT, ECPGt_EORT); #line 37 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 37 "dynalloc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( b , c , d , e , f , g , h , i ) values( 23.456 , 'varchar' , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , true , '(1,2,3,4)' , '2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128' ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( b , c , d , e , f , g , h , i ) values ( 23.456 , 'varchar' , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , true , '(1,2,3,4)' , '2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128' ) ", ECPGt_EOIT, ECPGt_EORT); #line 38 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 38 "dynalloc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( b , c , d , e , f , g , h , i ) values( 2.446456 , null , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , false , null , null ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( b , c , d , e , f , g , h , i ) values ( 2.446456 , null , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , false , null , null ) ", ECPGt_EOIT, ECPGt_EORT); #line 39 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 39 "dynalloc.pgc" - ECPGallocate_desc(__LINE__, "mydesc"); + ECPGallocate_desc(__LINE__, "mydesc"); #line 41 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); +if (sqlca.sqlcode < 0) sqlprint ( ); #line 41 "dynalloc.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select a , b , c , d , e , f , g , h , i from test order by a", ECPGt_EOIT, - ECPGt_descriptor, "mydesc", 0L, 0L, 0L, - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "select a , b , c , d , e , f , g , h , i from test order by a", ECPGt_EOIT, + ECPGt_descriptor, "mydesc", 0L, 0L, 0L, + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 42 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 42 "dynalloc.pgc" - { - ECPGget_desc(__LINE__, "mydesc", 1, ECPGd_indicator, - ECPGt_int, &(i1), (long) 1, (long) 0, sizeof(int), ECPGd_data, - ECPGt_int, &(d1), (long) 1, (long) 0, sizeof(int), ECPGd_EODT); + { ECPGget_desc(__LINE__, "mydesc", 1,ECPGd_indicator, + ECPGt_int,&(i1),(long)1,(long)0,sizeof(int), ECPGd_data, + ECPGt_int,&(d1),(long)1,(long)0,sizeof(int), ECPGd_EODT); #line 43 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 43 "dynalloc.pgc" - { - ECPGget_desc(__LINE__, "mydesc", 2, ECPGd_indicator, - ECPGt_int, &(i2), (long) 1, (long) 0, sizeof(int), ECPGd_data, - ECPGt_double, &(d2), (long) 1, (long) 0, sizeof(double), ECPGd_EODT); + { ECPGget_desc(__LINE__, "mydesc", 2,ECPGd_indicator, + ECPGt_int,&(i2),(long)1,(long)0,sizeof(int), ECPGd_data, + ECPGt_double,&(d2),(long)1,(long)0,sizeof(double), ECPGd_EODT); #line 44 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 44 "dynalloc.pgc" - { - ECPGget_desc(__LINE__, "mydesc", 3, ECPGd_indicator, - ECPGt_int, &(i3), (long) 1, (long) 0, sizeof(int), ECPGd_data, - ECPGt_char, &(d3), (long) 0, (long) 0, (1) * sizeof(char), ECPGd_EODT); + { ECPGget_desc(__LINE__, "mydesc", 3,ECPGd_indicator, + ECPGt_int,&(i3),(long)1,(long)0,sizeof(int), ECPGd_data, + ECPGt_char,&(d3),(long)0,(long)0,(1)*sizeof(char), ECPGd_EODT); #line 45 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 45 "dynalloc.pgc" - { - ECPGget_desc(__LINE__, "mydesc", 4, ECPGd_indicator, - ECPGt_int, &(i4), (long) 1, (long) 0, sizeof(int), ECPGd_data, - ECPGt_char, &(d4), (long) 0, (long) 0, (1) * sizeof(char), ECPGd_EODT); + { ECPGget_desc(__LINE__, "mydesc", 4,ECPGd_indicator, + ECPGt_int,&(i4),(long)1,(long)0,sizeof(int), ECPGd_data, + ECPGt_char,&(d4),(long)0,(long)0,(1)*sizeof(char), ECPGd_EODT); #line 46 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 46 "dynalloc.pgc" - { - ECPGget_desc(__LINE__, "mydesc", 5, ECPGd_indicator, - ECPGt_int, &(i5), (long) 1, (long) 0, sizeof(int), ECPGd_data, - ECPGt_char, &(d5), (long) 0, (long) 0, (1) * sizeof(char), ECPGd_EODT); + { ECPGget_desc(__LINE__, "mydesc", 5,ECPGd_indicator, + ECPGt_int,&(i5),(long)1,(long)0,sizeof(int), ECPGd_data, + ECPGt_char,&(d5),(long)0,(long)0,(1)*sizeof(char), ECPGd_EODT); #line 47 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 47 "dynalloc.pgc" - { - ECPGget_desc(__LINE__, "mydesc", 6, ECPGd_indicator, - ECPGt_int, &(i6), (long) 1, (long) 0, sizeof(int), ECPGd_data, - ECPGt_char, &(d6), (long) 0, (long) 0, (1) * sizeof(char), ECPGd_EODT); + { ECPGget_desc(__LINE__, "mydesc", 6,ECPGd_indicator, + ECPGt_int,&(i6),(long)1,(long)0,sizeof(int), ECPGd_data, + ECPGt_char,&(d6),(long)0,(long)0,(1)*sizeof(char), ECPGd_EODT); #line 48 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 48 "dynalloc.pgc" - { - ECPGget_desc(__LINE__, "mydesc", 7, ECPGd_indicator, - ECPGt_int, &(i7), (long) 1, (long) 0, sizeof(int), ECPGd_data, - ECPGt_char, &(d7), (long) 0, (long) 0, (1) * sizeof(char), ECPGd_EODT); + { ECPGget_desc(__LINE__, "mydesc", 7,ECPGd_indicator, + ECPGt_int,&(i7),(long)1,(long)0,sizeof(int), ECPGd_data, + ECPGt_char,&(d7),(long)0,(long)0,(1)*sizeof(char), ECPGd_EODT); #line 49 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 49 "dynalloc.pgc" - /* skip box for now */ - /* exec sql get descriptor mydesc value 8 :d8=DATA, :i8=INDICATOR; */ - { - ECPGget_desc(__LINE__, "mydesc", 9, ECPGd_indicator, - ECPGt_int, &(i9), (long) 1, (long) 0, sizeof(int), ECPGd_data, - ECPGt_char, &(d9), (long) 0, (long) 0, (1) * sizeof(char), ECPGd_EODT); + /* skip box for now */ + /* exec sql get descriptor mydesc value 8 :d8=DATA, :i8=INDICATOR; */ + { ECPGget_desc(__LINE__, "mydesc", 9,ECPGd_indicator, + ECPGt_int,&(i9),(long)1,(long)0,sizeof(int), ECPGd_data, + ECPGt_char,&(d9),(long)0,(long)0,(1)*sizeof(char), ECPGd_EODT); #line 52 "dynalloc.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint ( );} #line 52 "dynalloc.pgc" - printf("Result:\n"); - for (i = 0; i < sqlca.sqlerrd[2]; ++i) - { - if (i1[i]) - printf("NULL, "); - else - printf("%d, ", d1[i]); - - if (i2[i]) - printf("NULL, "); - else - printf("%f, ", d2[i]); - - if (i3[i]) - printf("NULL, "); - else - printf("'%s', ", d3[i]); - - if (i4[i]) - printf("NULL, "); - else - printf("'%s', ", d4[i]); - - if (i5[i]) - printf("NULL, "); - else - printf("'%s', ", d5[i]); - - if (i6[i]) - printf("NULL, "); - else - printf("'%s', ", d6[i]); - - if (i7[i]) - printf("NULL, "); - else - printf("'%s', ", d7[i]); - - if (i9[i]) - printf("NULL, "); - else - printf("'%s', ", d9[i]); - - printf("\n"); - } - ECPGfree_auto_mem(); - printf("\n"); - - ECPGdeallocate_desc(__LINE__, "mydesc"); + printf("Result:\n"); + for (i=0;i 0) - printf("char(%d)", LENGTH); - else - printf("text"); - break; - case SQL3_CHARACTER_VARYING: - if (LENGTH > 0) - printf("varchar(%d)", LENGTH); - else - printf("varchar()"); - break; - default: - if (TYPE < 0) - printf("", -TYPE); - else - printf("", TYPE); - break; - } - printf(")\n\toctet_length: %d returned_octet_length: %d)\n\t= ", - OCTET_LENGTH, RETURNED_OCTET_LENGTH); - if (INDICATOR == -1) - printf("NULL\n"); - else - switch (TYPE) - { - case SQL3_BOOLEAN: - { - ECPGget_desc(__LINE__, "MYDESC", INDEX, ECPGd_data, - ECPGt_bool, &(BOOLVAR), (long) 1, (long) 1, sizeof(bool), ECPGd_EODT); + switch (DATETIME_INTERVAL_CODE) + { + case SQL3_DDT_DATE: + printf ("date"); + break; + case SQL3_DDT_TIME: + printf ("time"); + break; + case SQL3_DDT_TIMESTAMP: + printf ("timestamp"); + break; + case SQL3_DDT_TIME_WITH_TIME_ZONE: + printf ("time with time zone"); + break; + case SQL3_DDT_TIMESTAMP_WITH_TIME_ZONE: + printf ("timestamp with time zone"); + break; + } + break; + case SQL3_INTERVAL: + printf ("interval"); + break; + case SQL3_CHARACTER: + if (LENGTH > 0) + printf ("char(%d)", LENGTH); + else + printf ("text"); + break; + case SQL3_CHARACTER_VARYING: + if (LENGTH > 0) + printf ("varchar(%d)", LENGTH); + else + printf ("varchar()"); + break; + default: + if (TYPE < 0) + printf ("", -TYPE); + else + printf ("", TYPE); + break; + } + printf (")\n\toctet_length: %d returned_octet_length: %d)\n\t= ", + OCTET_LENGTH, RETURNED_OCTET_LENGTH); + if (INDICATOR == -1) + printf ("NULL\n"); + else + switch (TYPE) + { + case SQL3_BOOLEAN: + { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data, + ECPGt_bool,&(BOOLVAR),(long)1,(long)1,sizeof(bool), ECPGd_EODT); #line 166 "dyntest.pgc" - if (sqlca.sqlcode < 0) - error(); - } +if (sqlca.sqlcode < 0) error ( );} #line 166 "dyntest.pgc" - printf("%s\n", BOOLVAR ? "true" : "false"); - break; - case SQL3_INTEGER: - case SQL3_SMALLINT: - { - ECPGget_desc(__LINE__, "MYDESC", INDEX, ECPGd_data, - ECPGt_int, &(INTVAR), (long) 1, (long) 1, sizeof(int), ECPGd_EODT); + printf ("%s\n", BOOLVAR ? "true" : "false"); + break; + case SQL3_INTEGER: + case SQL3_SMALLINT: + { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data, + ECPGt_int,&(INTVAR),(long)1,(long)1,sizeof(int), ECPGd_EODT); #line 171 "dyntest.pgc" - if (sqlca.sqlcode < 0) - error(); - } +if (sqlca.sqlcode < 0) error ( );} #line 171 "dyntest.pgc" - printf("%d\n", INTVAR); - break; - case SQL3_DOUBLE_PRECISION: - { - ECPGget_desc(__LINE__, "MYDESC", INDEX, ECPGd_data, - ECPGt_double, &(DOUBLEVAR), (long) 1, (long) 1, sizeof(double), ECPGd_EODT); + printf ("%d\n", INTVAR); + break; + case SQL3_DOUBLE_PRECISION: + { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data, + ECPGt_double,&(DOUBLEVAR),(long)1,(long)1,sizeof(double), ECPGd_EODT); #line 175 "dyntest.pgc" - if (sqlca.sqlcode < 0) - error(); - } +if (sqlca.sqlcode < 0) error ( );} #line 175 "dyntest.pgc" - printf("%.*f\n", PRECISION, DOUBLEVAR); - break; - case SQL3_DATE_TIME_TIMESTAMP: - { - ECPGget_desc(__LINE__, "MYDESC", INDEX, ECPGd_data, - ECPGt_char, (STRINGVAR), (long) 1024, (long) 1, (1024) * sizeof(char), ECPGd_di_code, - ECPGt_int, &(DATETIME_INTERVAL_CODE), (long) 1, (long) 1, sizeof(int), ECPGd_EODT); + printf ("%.*f\n", PRECISION, DOUBLEVAR); + break; + case SQL3_DATE_TIME_TIMESTAMP: + { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data, + ECPGt_char,(STRINGVAR),(long)1024,(long)1,(1024)*sizeof(char), ECPGd_di_code, + ECPGt_int,&(DATETIME_INTERVAL_CODE),(long)1,(long)1,sizeof(int), ECPGd_EODT); #line 181 "dyntest.pgc" - if (sqlca.sqlcode < 0) - error(); - } +if (sqlca.sqlcode < 0) error ( );} #line 181 "dyntest.pgc" - printf("%d \"%s\"\n", DATETIME_INTERVAL_CODE, STRINGVAR); - break; - case SQL3_CHARACTER: - case SQL3_CHARACTER_VARYING: - { - ECPGget_desc(__LINE__, "MYDESC", INDEX, ECPGd_data, - ECPGt_char, (STRINGVAR), (long) 1024, (long) 1, (1024) * sizeof(char), ECPGd_EODT); + printf ("%d \"%s\"\n", DATETIME_INTERVAL_CODE, STRINGVAR); + break; + case SQL3_CHARACTER: + case SQL3_CHARACTER_VARYING: + { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data, + ECPGt_char,(STRINGVAR),(long)1024,(long)1,(1024)*sizeof(char), ECPGd_EODT); #line 186 "dyntest.pgc" - if (sqlca.sqlcode < 0) - error(); - } +if (sqlca.sqlcode < 0) error ( );} #line 186 "dyntest.pgc" - printf("\"%s\"\n", STRINGVAR); - break; - default: - { - ECPGget_desc(__LINE__, "MYDESC", INDEX, ECPGd_data, - ECPGt_char, (STRINGVAR), (long) 1024, (long) 1, (1024) * sizeof(char), ECPGd_EODT); + printf ("\"%s\"\n", STRINGVAR); + break; + default: + { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data, + ECPGt_char,(STRINGVAR),(long)1024,(long)1,(1024)*sizeof(char), ECPGd_EODT); #line 190 "dyntest.pgc" - if (sqlca.sqlcode < 0) - error(); - } +if (sqlca.sqlcode < 0) error ( );} #line 190 "dyntest.pgc" - printf("<\"%s\">\n", STRINGVAR); - break; - } - } + printf ("<\"%s\">\n", STRINGVAR); + break; + } } + } - { - ECPGdo(__LINE__, 0, 1, NULL, "close MYCURS", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "close MYCURS", ECPGt_EOIT, ECPGt_EORT); #line 197 "dyntest.pgc" - if (sqlca.sqlcode < 0) - error(); - } +if (sqlca.sqlcode < 0) error ( );} #line 197 "dyntest.pgc" - ECPGdeallocate_desc(__LINE__, "MYDESC"); + ECPGdeallocate_desc(__LINE__, "MYDESC"); #line 199 "dyntest.pgc" - if (sqlca.sqlcode < 0) - error(); +if (sqlca.sqlcode < 0) error ( ); #line 199 "dyntest.pgc" - return 0; -} + return 0; + } diff --git a/src/interfaces/ecpg/test/expected/sql-execute.c b/src/interfaces/ecpg/test/expected/sql-execute.c index d07d82cc97..662f554f4e 100644 --- a/src/interfaces/ecpg/test/expected/sql-execute.c +++ b/src/interfaces/ecpg/test/expected/sql-execute.c @@ -31,195 +31,155 @@ int main(void) { /* exec sql begin declare section */ - - - - - + + + + + #line 14 "execute.pgc" - int amount[8]; - + int amount [ 8 ] ; + #line 15 "execute.pgc" - int increment = 100; - + int increment = 100 ; + #line 16 "execute.pgc" - char name[8][8]; - + char name [ 8 ] [ 8 ] ; + #line 17 "execute.pgc" - char letter[8][1]; - + char letter [ 8 ] [ 1 ] ; + #line 18 "execute.pgc" - char command[128]; - + char command [ 128 ] ; /* exec sql end declare section */ #line 19 "execute.pgc" - int i, - j; + int i,j; ECPGdebug(1, stderr); - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, "main", 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , "main", 0); #line 24 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 24 "execute.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test ( name char ( 8 ) , amount int , letter char ( 1 ) ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table test ( name char ( 8 ) , amount int , letter char ( 1 ) ) ", ECPGt_EOIT, ECPGt_EORT); #line 25 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 25 "execute.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 26 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 26 "execute.pgc" sprintf(command, "insert into test (name, amount, letter) values ('db: ''r1''', 1, 'f')"); - { - ECPGdo(__LINE__, 0, 1, NULL, "?", - ECPGt_char_variable, (command), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "?", + ECPGt_char_variable,(command),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 29 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 29 "execute.pgc" sprintf(command, "insert into test (name, amount, letter) values ('db: ''r1''', 2, 't')"); - { - ECPGdo(__LINE__, 0, 1, NULL, "?", - ECPGt_char_variable, (command), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "?", + ECPGt_char_variable,(command),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 32 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 32 "execute.pgc" sprintf(command, "insert into test (name, amount, letter) select name, amount+10, letter from test"); - { - ECPGdo(__LINE__, 0, 1, NULL, "?", - ECPGt_char_variable, (command), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "?", + ECPGt_char_variable,(command),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 35 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 35 "execute.pgc" printf("Inserted %ld tuples via execute immediate\n", sqlca.sqlerrd[2]); sprintf(command, "insert into test (name, amount, letter) select name, amount+?, letter from test"); - { - ECPGprepare(__LINE__, "I", command); + { ECPGprepare(__LINE__, "I" , command); #line 40 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 40 "execute.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "?", - ECPGt_char_variable, (ECPGprepared_statement("I")), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, &(increment), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "?", + ECPGt_char_variable,(ECPGprepared_statement("I")),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,&(increment),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 41 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 41 "execute.pgc" printf("Inserted %ld tuples via prepared execute\n", sqlca.sqlerrd[2]); - { - ECPGtrans(__LINE__, NULL, "commit"); + { ECPGtrans(__LINE__, NULL, "commit"); #line 45 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 45 "execute.pgc" - sprintf(command, "select * from test"); + sprintf (command, "select * from test"); - { - ECPGprepare(__LINE__, "F", command); + { ECPGprepare(__LINE__, "F" , command); #line 49 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 49 "execute.pgc" - /* declare CUR cursor for ? */ + /* declare CUR cursor for ? */ #line 50 "execute.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "declare CUR cursor for ?", - ECPGt_char_variable, (ECPGprepared_statement("F")), (long) 1, (long) 1, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "declare CUR cursor for ?", + ECPGt_char_variable,(ECPGprepared_statement("F")),(long)1,(long)1,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 52 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 52 "execute.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "fetch 8 in CUR", ECPGt_EOIT, - ECPGt_char, (name), (long) 8, (long) 8, (8) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, (amount), (long) 1, (long) 8, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_char, (letter), (long) 1, (long) 8, (1) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "fetch 8 in CUR", ECPGt_EOIT, + ECPGt_char,(name),(long)8,(long)8,(8)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,(amount),(long)1,(long)8,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_char,(letter),(long)1,(long)8,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 53 "execute.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 53 "execute.pgc" - for (i = 0, j = sqlca.sqlerrd[2]; i < j; i++) + for (i=0, j=sqlca.sqlerrd[2]; i port [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGexecute line 18: QUERY: show search_path on connection regress1 +[NO_PID]: ECPGexecute line 18: QUERY: set search_path to 'public' on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGexecute line 18: Correctly got 1 tuples with 1 fields +[NO_PID]: ECPGexecute line 18 Ok: SET [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGget_data line 18: RESULT: "$user",public offset: -1 array: Yes +[NO_PID]: ECPGexecute line 19: QUERY: show search_path on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGexecute line 21: QUERY: show wal_buffers on connection regress1 +[NO_PID]: ECPGexecute line 19: Correctly got 1 tuples with 1 fields [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGexecute line 21: Correctly got 1 tuples with 1 fields +[NO_PID]: ECPGget_data line 19: RESULT: public offset: -1 array: Yes [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGget_data line 21: RESULT: 8 offset: -1 array: Yes +[NO_PID]: ECPGexecute line 22: QUERY: set standard_conforming_strings to off on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGexecute line 24: QUERY: show standard_conforming_strings on connection regress1 +[NO_PID]: ECPGexecute line 22 Ok: SET [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGexecute line 24: Correctly got 1 tuples with 1 fields +[NO_PID]: ECPGexecute line 23: QUERY: show standard_conforming_strings on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGget_data line 24: RESULT: off offset: -1 array: Yes +[NO_PID]: ECPGexecute line 23: Correctly got 1 tuples with 1 fields +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ECPGget_data line 23: RESULT: off offset: -1 array: Yes +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ECPGexecute line 26: QUERY: set time zone PST8PDT on connection regress1 +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ECPGexecute line 26 Ok: SET [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGexecute line 27: QUERY: show time zone on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGexecute line 27: Correctly got 1 tuples with 1 fields [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGget_data line 27: RESULT: PST8PDT offset: -1 array: Yes +[NO_PID]: ECPGget_data line 27: RESULT: pst8pdt offset: -1 array: Yes +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ECPGexecute line 30: QUERY: set transaction isolation level read committed on connection regress1 +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ECPGexecute line 30 Ok: SET [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGexecute line 30: QUERY: show transaction isolation level on connection regress1 +[NO_PID]: ECPGexecute line 31: QUERY: show transaction isolation level on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGexecute line 30: Correctly got 1 tuples with 1 fields +[NO_PID]: ECPGexecute line 31: Correctly got 1 tuples with 1 fields [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGget_data line 30: RESULT: read committed offset: -1 array: Yes +[NO_PID]: ECPGget_data line 31: RESULT: read committed offset: -1 array: Yes [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: Connection regress1 closed. [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/sql-show.stdout b/src/interfaces/ecpg/test/expected/sql-show.stdout index 5c1864e757..ba87150df4 100644 --- a/src/interfaces/ecpg/test/expected/sql-show.stdout +++ b/src/interfaces/ecpg/test/expected/sql-show.stdout @@ -1,5 +1,4 @@ -Var: Search path: "$user",public -Var: WAL buffers: 8 +Var: Search path: public Var: Standard conforming strings: off -Time Zone: PST8PDT +Time Zone: pst8pdt Transaction isolation level: read committed diff --git a/src/interfaces/ecpg/test/expected/sql-update.c b/src/interfaces/ecpg/test/expected/sql-update.c index adfed5593d..833b96f06b 100644 --- a/src/interfaces/ecpg/test/expected/sql-update.c +++ b/src/interfaces/ecpg/test/expected/sql-update.c @@ -22,161 +22,119 @@ #line 5 "update.pgc" -int -main(int argc, char *argv[]) -{ - /* exec sql begin declare section */ - - +int main(int argc, char* argv[]) { + /* exec sql begin declare section */ + + #line 9 "update.pgc" - int i1[3], - i2[3]; - + int i1 [ 3 ] , i2 [ 3 ] ; /* exec sql end declare section */ #line 10 "update.pgc" - ECPGdebug(1, stderr); - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); - } + ECPGdebug(1, stderr); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); } #line 13 "update.pgc" - /* exec sql whenever sql_warning sqlprint ; */ + /* exec sql whenever sql_warning sqlprint ; */ #line 15 "update.pgc" - /* exec sql whenever sqlerror sqlprint ; */ + /* exec sql whenever sqlerror sqlprint ; */ #line 16 "update.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test ( a int , b int ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "create table test ( a int , b int ) ", ECPGt_EOIT, ECPGt_EORT); #line 18 "update.pgc" - if (sqlca.sqlwarn[0] == 'W') - sqlprint(); +if (sqlca.sqlwarn[0] == 'W') sqlprint(); #line 18 "update.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 18 "update.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( a , b ) values( 1 , 1 ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( a , b ) values ( 1 , 1 ) ", ECPGt_EOIT, ECPGt_EORT); #line 20 "update.pgc" - if (sqlca.sqlwarn[0] == 'W') - sqlprint(); +if (sqlca.sqlwarn[0] == 'W') sqlprint(); #line 20 "update.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 20 "update.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( a , b ) values( 2 , 2 ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( a , b ) values ( 2 , 2 ) ", ECPGt_EOIT, ECPGt_EORT); #line 21 "update.pgc" - if (sqlca.sqlwarn[0] == 'W') - sqlprint(); +if (sqlca.sqlwarn[0] == 'W') sqlprint(); #line 21 "update.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 21 "update.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( a , b ) values( 3 , 3 ) ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( a , b ) values ( 3 , 3 ) ", ECPGt_EOIT, ECPGt_EORT); #line 22 "update.pgc" - if (sqlca.sqlwarn[0] == 'W') - sqlprint(); +if (sqlca.sqlwarn[0] == 'W') sqlprint(); #line 22 "update.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 22 "update.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "update test set a = a + 1 ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "update test set a = a + 1 ", ECPGt_EOIT, ECPGt_EORT); #line 24 "update.pgc" - if (sqlca.sqlwarn[0] == 'W') - sqlprint(); +if (sqlca.sqlwarn[0] == 'W') sqlprint(); #line 24 "update.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 24 "update.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "update test set ( a , b )=( 5 , 5 ) where a = 4 ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "update test set ( a , b )= ( 5 , 5 ) where a = 4 ", ECPGt_EOIT, ECPGt_EORT); #line 25 "update.pgc" - if (sqlca.sqlwarn[0] == 'W') - sqlprint(); +if (sqlca.sqlwarn[0] == 'W') sqlprint(); #line 25 "update.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 25 "update.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "update test set a = 4 where a = 3 ", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "update test set a = 4 where a = 3 ", ECPGt_EOIT, ECPGt_EORT); #line 26 "update.pgc" - if (sqlca.sqlwarn[0] == 'W') - sqlprint(); +if (sqlca.sqlwarn[0] == 'W') sqlprint(); #line 26 "update.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 26 "update.pgc" - ; - - { - ECPGdo(__LINE__, 0, 1, NULL, "select a , b from test order by a", ECPGt_EOIT, - ECPGt_int, (i1), (long) 1, (long) 3, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, (i2), (long) 1, (long) 3, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); +; + + { ECPGdo(__LINE__, 0, 1, NULL, "select a , b from test order by a", ECPGt_EOIT, + ECPGt_int,(i1),(long)1,(long)3,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,(i2),(long)1,(long)3,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 28 "update.pgc" - if (sqlca.sqlwarn[0] == 'W') - sqlprint(); +if (sqlca.sqlwarn[0] == 'W') sqlprint(); #line 28 "update.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 28 "update.pgc" - printf("test\na b\n%d %d\n%d %d\n%d %d\n", i1[0], i2[0], i1[1], i2[1], i1[2], i2[2]); + printf("test\na b\n%d %d\n%d %d\n%d %d\n", i1[0], i2[0], i1[1], i2[1], i1[2], i2[2]); - { - ECPGdisconnect(__LINE__, "ALL"); + { ECPGdisconnect(__LINE__, "ALL"); #line 32 "update.pgc" - if (sqlca.sqlwarn[0] == 'W') - sqlprint(); +if (sqlca.sqlwarn[0] == 'W') sqlprint(); #line 32 "update.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 32 "update.pgc" - return 0; + return 0; } diff --git a/src/interfaces/ecpg/test/expected/thread-thread.c b/src/interfaces/ecpg/test/expected/thread-thread.c index f2d4b3ff7a..7252349a87 100644 --- a/src/interfaces/ecpg/test/expected/thread-thread.c +++ b/src/interfaces/ecpg/test/expected/thread-thread.c @@ -36,215 +36,171 @@ main(void) #line 19 "thread.pgc" -void *test_thread(void *arg); +void *test_thread(void *arg); -int nthreads = 10; -int iterations = 20; +int nthreads = 10; +int iterations = 20; -int -main(int argc, char *argv[]) +int main(int argc, char *argv[]) { - pthread_t *threads; - int n; - - /* exec sql begin declare section */ - - + pthread_t *threads; + int n; + /* exec sql begin declare section */ + + #line 31 "thread.pgc" - int l_rows; - + int l_rows ; /* exec sql end declare section */ #line 32 "thread.pgc" - /* - * Switch off debug output for regression tests. The threads get executed - * in more or less random order - */ - ECPGdebug(0, stderr); + /* Switch off debug output for regression tests. The threads get executed in + * more or less random order */ + ECPGdebug(0, stderr); - /* setup test_thread table */ - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); - } + /* setup test_thread table */ + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); } #line 41 "thread.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "drop table test_thread ", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "drop table test_thread ", ECPGt_EOIT, ECPGt_EORT);} #line 42 "thread.pgc" - /* DROP might fail */ - { - ECPGtrans(__LINE__, NULL, "commit"); - } + /* DROP might fail */ + { ECPGtrans(__LINE__, NULL, "commit");} #line 43 "thread.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test_thread ( tstamp timestamp not null default cast( timeofday () as timestamp ) , thread TEXT not null , iteration integer not null , primary key( thread , iteration ) ) ", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "create table test_thread ( tstamp timestamp not null default cast( timeofday () as timestamp ) , thread TEXT not null , iteration integer not null , primary key( thread , iteration ) ) ", ECPGt_EOIT, ECPGt_EORT);} #line 48 "thread.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); - } + { ECPGtrans(__LINE__, NULL, "commit");} #line 49 "thread.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 50 "thread.pgc" - /* create, and start, threads */ - threads = calloc(nthreads, sizeof(pthread_t)); - if (threads == NULL) - { - fprintf(stderr, "Cannot alloc memory\n"); - return (1); - } - for (n = 0; n < nthreads; n++) - { - pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1)); - } - - /* wait for thread completion */ - for (n = 0; n < nthreads; n++) - { - pthread_join(threads[n], NULL); - } - free(threads); - - /* and check results */ - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); - } + /* create, and start, threads */ + threads = calloc(nthreads, sizeof(pthread_t)); + if( threads == NULL ) + { + fprintf(stderr, "Cannot alloc memory\n"); + return( 1 ); + } + for( n = 0; n < nthreads; n++ ) + { + pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1)); + } + + /* wait for thread completion */ + for( n = 0; n < nthreads; n++ ) + { + pthread_join(threads[n], NULL); + } + free(threads); + + /* and check results */ + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); } #line 72 "thread.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select count (*) from test_thread ", ECPGt_EOIT, - ECPGt_int, &(l_rows), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "select count (*) from test_thread ", ECPGt_EOIT, + ECPGt_int,&(l_rows),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 73 "thread.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); - } + { ECPGtrans(__LINE__, NULL, "commit");} #line 74 "thread.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 75 "thread.pgc" - if (l_rows == (nthreads * iterations)) - printf("Success.\n"); - else - printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows); + if( l_rows == (nthreads * iterations) ) + printf("Success.\n"); + else + printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows); - return (0); + return( 0 ); } -void * -test_thread(void *arg) +void *test_thread(void *arg) { - long threadnum = (long) arg; - - /* exec sql begin declare section */ - - - + long threadnum = (long)arg; + /* exec sql begin declare section */ + + + #line 88 "thread.pgc" - int l_i; - + int l_i ; + #line 89 "thread.pgc" - char l_connection[128]; - + char l_connection [ 128 ] ; /* exec sql end declare section */ #line 90 "thread.pgc" - /* build up connection name, and connect to database */ - snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum); - /* exec sql whenever sqlerror sqlprint ; */ + /* build up connection name, and connect to database */ + snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum); + /* exec sql whenever sqlerror sqlprint ; */ #line 94 "thread.pgc" - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, l_connection, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , l_connection, 0); #line 95 "thread.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 95 "thread.pgc" - if (sqlca.sqlcode != 0) - { - printf("%s: ERROR: cannot connect to database!\n", l_connection); - return (NULL); - } - { - ECPGtrans(__LINE__, l_connection, "begin transaction "); + if( sqlca.sqlcode != 0 ) + { + printf("%s: ERROR: cannot connect to database!\n", l_connection); + return( NULL ); + } + { ECPGtrans(__LINE__, l_connection, "begin transaction "); #line 101 "thread.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 101 "thread.pgc" - /* insert into test_thread table */ - for (l_i = 1; l_i <= iterations; l_i++) - { + /* insert into test_thread table */ + for( l_i = 1; l_i <= iterations; l_i++ ) + { #ifdef DEBUG - printf("%s: inserting %d\n", l_connection, l_i); + printf("%s: inserting %d\n", l_connection, l_i); #endif - { - ECPGdo(__LINE__, 0, 1, l_connection, "insert into test_thread ( thread , iteration ) values( ? , ? ) ", - ECPGt_char, (l_connection), (long) 128, (long) 1, (128) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, &(l_i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, l_connection, "insert into test_thread ( thread , iteration ) values ( ? , ? ) ", + ECPGt_char,(l_connection),(long)128,(long)1,(128)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,&(l_i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 109 "thread.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 109 "thread.pgc" #ifdef DEBUG - if (sqlca.sqlcode == 0) - printf("%s: insert done\n", l_connection); - else - printf("%s: ERROR: insert failed!\n", l_connection); + if( sqlca.sqlcode == 0 ) + printf("%s: insert done\n", l_connection); + else + printf("%s: ERROR: insert failed!\n", l_connection); #endif - } + } - /* all done */ - { - ECPGtrans(__LINE__, l_connection, "commit"); + /* all done */ + { ECPGtrans(__LINE__, l_connection, "commit"); #line 119 "thread.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 119 "thread.pgc" - { - ECPGdisconnect(__LINE__, l_connection); + { ECPGdisconnect(__LINE__, l_connection); #line 120 "thread.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 120 "thread.pgc" #ifdef DEBUG - printf("%s: done!\n", l_connection); + printf("%s: done!\n", l_connection); #endif - return (NULL); + return( NULL ); } - -#endif /* ENABLE_THREAD_SAFETY */ +#endif /* ENABLE_THREAD_SAFETY */ diff --git a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c index f7bf6fab76..5c2d70ea1e 100644 --- a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c +++ b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c @@ -37,215 +37,171 @@ main(void) #line 20 "thread_implicit.pgc" -void *test_thread(void *arg); +void *test_thread(void *arg); -int nthreads = 10; -int iterations = 20; +int nthreads = 10; +int iterations = 20; -int -main(int argc, char *argv[]) +int main(int argc, char *argv[]) { - pthread_t *threads; - int n; - - /* exec sql begin declare section */ - - + pthread_t *threads; + int n; + /* exec sql begin declare section */ + + #line 32 "thread_implicit.pgc" - int l_rows; - + int l_rows ; /* exec sql end declare section */ #line 33 "thread_implicit.pgc" - /* - * Switch off debug output for regression tests. The threads get executed - * in more or less random order - */ - ECPGdebug(0, stderr); + /* Switch off debug output for regression tests. The threads get executed in + * more or less random order */ + ECPGdebug(0, stderr); - /* setup test_thread table */ - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); - } + /* setup test_thread table */ + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); } #line 42 "thread_implicit.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "drop table test_thread ", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "drop table test_thread ", ECPGt_EOIT, ECPGt_EORT);} #line 43 "thread_implicit.pgc" - /* DROP might fail */ - { - ECPGtrans(__LINE__, NULL, "commit"); - } + /* DROP might fail */ + { ECPGtrans(__LINE__, NULL, "commit");} #line 44 "thread_implicit.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "create table test_thread ( tstamp timestamp not null default cast( timeofday () as timestamp ) , thread TEXT not null , iteration integer not null , primary key( thread , iteration ) ) ", ECPGt_EOIT, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "create table test_thread ( tstamp timestamp not null default cast( timeofday () as timestamp ) , thread TEXT not null , iteration integer not null , primary key( thread , iteration ) ) ", ECPGt_EOIT, ECPGt_EORT);} #line 49 "thread_implicit.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); - } + { ECPGtrans(__LINE__, NULL, "commit");} #line 50 "thread_implicit.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 51 "thread_implicit.pgc" - /* create, and start, threads */ - threads = calloc(nthreads, sizeof(pthread_t)); - if (threads == NULL) - { - fprintf(stderr, "Cannot alloc memory\n"); - return (1); - } - for (n = 0; n < nthreads; n++) - { - pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1)); - } - - /* wait for thread completion */ - for (n = 0; n < nthreads; n++) - { - pthread_join(threads[n], NULL); - } - free(threads); - - /* and check results */ - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0); - } + /* create, and start, threads */ + threads = calloc(nthreads, sizeof(pthread_t)); + if( threads == NULL ) + { + fprintf(stderr, "Cannot alloc memory\n"); + return( 1 ); + } + for( n = 0; n < nthreads; n++ ) + { + pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1)); + } + + /* wait for thread completion */ + for( n = 0; n < nthreads; n++ ) + { + pthread_join(threads[n], NULL); + } + free(threads); + + /* and check results */ + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); } #line 73 "thread_implicit.pgc" - { - ECPGdo(__LINE__, 0, 1, NULL, "select count (*) from test_thread ", ECPGt_EOIT, - ECPGt_int, &(l_rows), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT); - } + { ECPGdo(__LINE__, 0, 1, NULL, "select count (*) from test_thread ", ECPGt_EOIT, + ECPGt_int,&(l_rows),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);} #line 74 "thread_implicit.pgc" - { - ECPGtrans(__LINE__, NULL, "commit"); - } + { ECPGtrans(__LINE__, NULL, "commit");} #line 75 "thread_implicit.pgc" - { - ECPGdisconnect(__LINE__, "CURRENT"); - } + { ECPGdisconnect(__LINE__, "CURRENT");} #line 76 "thread_implicit.pgc" - if (l_rows == (nthreads * iterations)) - printf("Success.\n"); - else - printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows); + if( l_rows == (nthreads * iterations) ) + printf("Success.\n"); + else + printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows); - return (0); + return( 0 ); } -void * -test_thread(void *arg) +void *test_thread(void *arg) { - long threadnum = (long) arg; - - /* exec sql begin declare section */ - - - + long threadnum = (long)arg; + /* exec sql begin declare section */ + + + #line 89 "thread_implicit.pgc" - int l_i; - + int l_i ; + #line 90 "thread_implicit.pgc" - char l_connection[128]; - + char l_connection [ 128 ] ; /* exec sql end declare section */ #line 91 "thread_implicit.pgc" - /* build up connection name, and connect to database */ - snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum); - /* exec sql whenever sqlerror sqlprint ; */ + /* build up connection name, and connect to database */ + snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum); + /* exec sql whenever sqlerror sqlprint ; */ #line 95 "thread_implicit.pgc" - { - ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, l_connection, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , l_connection, 0); #line 96 "thread_implicit.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 96 "thread_implicit.pgc" - if (sqlca.sqlcode != 0) - { - printf("%s: ERROR: cannot connect to database!\n", l_connection); - return (NULL); - } - { - ECPGtrans(__LINE__, NULL, "begin transaction "); + if( sqlca.sqlcode != 0 ) + { + printf("%s: ERROR: cannot connect to database!\n", l_connection); + return( NULL ); + } + { ECPGtrans(__LINE__, NULL, "begin transaction "); #line 102 "thread_implicit.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 102 "thread_implicit.pgc" - /* insert into test_thread table */ - for (l_i = 1; l_i <= iterations; l_i++) - { + /* insert into test_thread table */ + for( l_i = 1; l_i <= iterations; l_i++ ) + { #ifdef DEBUG - printf("%s: inserting %d\n", l_connection, l_i); + printf("%s: inserting %d\n", l_connection, l_i); #endif - { - ECPGdo(__LINE__, 0, 1, NULL, "insert into test_thread ( thread , iteration ) values( ? , ? ) ", - ECPGt_char, (l_connection), (long) 128, (long) 1, (128) * sizeof(char), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, - ECPGt_int, &(l_i), (long) 1, (long) 1, sizeof(int), - ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, "insert into test_thread ( thread , iteration ) values ( ? , ? ) ", + ECPGt_char,(l_connection),(long)128,(long)1,(128)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, + ECPGt_int,&(l_i),(long)1,(long)1,sizeof(int), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); #line 110 "thread_implicit.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 110 "thread_implicit.pgc" #ifdef DEBUG - if (sqlca.sqlcode == 0) - printf("%s: insert done\n", l_connection); - else - printf("%s: ERROR: insert failed!\n", l_connection); + if( sqlca.sqlcode == 0 ) + printf("%s: insert done\n", l_connection); + else + printf("%s: ERROR: insert failed!\n", l_connection); #endif - } + } - /* all done */ - { - ECPGtrans(__LINE__, NULL, "commit"); + /* all done */ + { ECPGtrans(__LINE__, NULL, "commit"); #line 120 "thread_implicit.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 120 "thread_implicit.pgc" - { - ECPGdisconnect(__LINE__, l_connection); + { ECPGdisconnect(__LINE__, l_connection); #line 121 "thread_implicit.pgc" - if (sqlca.sqlcode < 0) - sqlprint(); - } +if (sqlca.sqlcode < 0) sqlprint();} #line 121 "thread_implicit.pgc" #ifdef DEBUG - printf("%s: done!\n", l_connection); + printf("%s: done!\n", l_connection); #endif - return (NULL); + return( NULL ); } - -#endif /* ENABLE_THREAD_SAFETY */ +#endif /* ENABLE_THREAD_SAFETY */ diff --git a/src/interfaces/ecpg/test/sql/show.pgc b/src/interfaces/ecpg/test/sql/show.pgc index afa2cee908..8eb71a7262 100644 --- a/src/interfaces/ecpg/test/sql/show.pgc +++ b/src/interfaces/ecpg/test/sql/show.pgc @@ -15,24 +15,22 @@ int main(int argc, char* argv[]) { EXEC SQL WHENEVER SQLWARNING SQLPRINT; EXEC SQL WHENEVER SQLERROR SQLPRINT; + EXEC SQL SET search_path TO 'public'; EXEC SQL SHOW search_path INTO :var; printf("Var: Search path: %s\n", var); - EXEC SQL SHOW wal_buffers INTO :var; - printf("Var: WAL buffers: %s\n", var); - + EXEC SQL SET standard_conforming_strings TO off; EXEC SQL SHOW standard_conforming_strings INTO :var; printf("Var: Standard conforming strings: %s\n", var); + EXEC SQL SET TIME ZONE PST8PDT; EXEC SQL SHOW TIME ZONE INTO :var; printf("Time Zone: %s\n", var); + EXEC SQL SET TRANSACTION ISOLATION LEVEL read committed; EXEC SQL SHOW TRANSACTION ISOLATION LEVEL INTO :var; printf("Transaction isolation level: %s\n", var); - /* Do not ask for the user name, it may differ in a regression test */ - /* EXEC SQL SHOW SESSION AUTHORIZATION INTO :var; */ - EXEC SQL DISCONNECT ALL; return 0; -- 2.40.0