rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced manually synced preproc.y by the one created by the new script. 

Adapted regression test files accordingly.
This commit is contained in:
Michael Meskes 2008-11-11 11:41:24 +00:00
parent 3be2448525
commit c7f5c7c128
60 changed files with 9347 additions and 5126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14075
src/interfaces/ecpg/preproc/preproc.y
View File

File diff suppressed because it is too large Load Diff

10
src/interfaces/ecpg/test/expected/compat_informix-rnull.c
View File

@ -34,7 +34,7 @@ int main(void)
{
#line 15 "rnull.pgc"
char c [] = "abc" ;
char c [] = "abc" ;
#line 15 "rnull.pgc"
@ -111,7 +111,7 @@ 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 ( );}
@ -138,7 +138,7 @@ 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 ( );}
@ -182,7 +182,7 @@ 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 ( );}
@ -275,7 +275,7 @@ 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 ( );}

8
src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr
View File

@ -8,7 +8,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 31: OK: CREATE TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 34: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 34: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 36: query: insert into test ( id , c , s , i , b , f , l , dbl ) values ( 1 , $1 , $2 , $3 , $4 , $5 , $6 , $7 ) ; with 7 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -30,7 +30,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 36: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 39: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 39: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 52: query: insert into test ( id , c , s , i , b , f , l , dbl , dec , dat , tmp ) values ( 2 , $1 , $2 , $3 , $4 , $5 , $6 , $7 , $8 , $9 , $10 ) ; with 10 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -58,7 +58,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 52: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 55: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 55: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 59: query: select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 1 ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -118,7 +118,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 91: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 92: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 92: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

14
src/interfaces/ecpg/test/expected/compat_informix-test_informix.c
View File

@ -74,7 +74,7 @@ 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 ( );}
@ -89,7 +89,7 @@ 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 ( );}
@ -104,7 +104,7 @@ 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 ( );}
@ -118,7 +118,7 @@ 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 ( );}
@ -133,7 +133,7 @@ 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 ( );}
@ -203,7 +203,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
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 ( );}
@ -215,7 +215,7 @@ 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 ( );}

12
src/interfaces/ecpg/test/expected/compat_informix-test_informix.stderr
View File

@ -16,7 +16,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 27: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 28: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 28: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 31: query: insert into test ( i , j ) values ( 7 , 12 ) ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -26,7 +26,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlstate 23505 (sqlcode -239) on line 31: duplicate key value violates unique constraint "test_pkey" on line 31
[NO_PID]: sqlca: code: -239, state: 23505
[NO_PID]: ECPGtrans on line 33: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 33: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 35: query: insert into test ( i , j ) values ( $1 , 1 ) ; with 1 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -36,7 +36,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 35: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 36: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 36: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 39: query: select i from test where j = ( select j from test ) ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -46,7 +46,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlstate 21000 (sqlcode -284) on line 39: more than one row returned by a subquery used as an expression on line 39
[NO_PID]: sqlca: code: -284, state: 21000
[NO_PID]: ECPGtrans on line 40: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 40: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 43: query: select i from test where j = ( select j from test order by i limit 1 ) ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -114,7 +114,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode 100 on line 78: no data found on line 78
[NO_PID]: sqlca: code: 100, state: 02000
[NO_PID]: ECPGtrans on line 81: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 81: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 82: query: drop table test ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -122,7 +122,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 82: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 83: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 83: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

8
src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c
View File

@ -114,7 +114,7 @@ static void sql_check(char *fn, char *caller, int ignore)
printf("%s\n", errorstring);
/* attempt a ROLLBACK */
{ ECPGtrans(__LINE__, NULL, "rollback");}
{ ECPGtrans(__LINE__, NULL, "rollback ");}
#line 27 "test_informix2.pgc"
@ -157,7 +157,7 @@ int main(void)
timestamp maxd ;
#line 53 "test_informix2.pgc"
char dbname [ 30 ] ;
char dbname [ 30 ] ;
/* exec sql end declare section */
#line 54 "test_informix2.pgc"
@ -245,7 +245,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
sql_check("main", "update", 0);
{ ECPGtrans(__LINE__, NULL, "commit");
{ ECPGtrans(__LINE__, NULL, "commit ");
#line 100 "test_informix2.pgc"
if (sqlca.sqlcode < 0) sqlprint();}
@ -260,7 +260,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
sql_check("main", "drop", 0);
{ ECPGtrans(__LINE__, NULL, "commit");
{ ECPGtrans(__LINE__, NULL, "commit ");
#line 105 "test_informix2.pgc"
if (sqlca.sqlcode < 0) sqlprint();}

4
src/interfaces/ecpg/test/expected/compat_informix-test_informix2.stderr
View File

@ -50,7 +50,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 95: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 100: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 100: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 102: query: drop table history ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -58,7 +58,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 102: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 105: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 105: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

6
src/interfaces/ecpg/test/expected/connect-test1.c.in
View File

@ -26,10 +26,10 @@ main(void)
#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"
@ -39,7 +39,7 @@ main(void)
{ ECPGconnect(__LINE__, 0, "connectdb" , NULL, NULL , "main", 0); }
#line 22 "test1.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);}
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);}
#line 23 "test1.pgc"
{ ECPGdisconnect(__LINE__, "CURRENT");}

2
src/interfaces/ecpg/test/expected/connect-test1.stderr
View File

@ -2,7 +2,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 23: query: alter user connectuser encrypted password 'connectpw'; with 0 parameter(s) on connection main
[NO_PID]: ecpg_execute on line 23: query: alter user connectuser encrypted password 'connectpw'; with 0 parameter(s) on connection main
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 23: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000

14
src/interfaces/ecpg/test/expected/connect-test2.c
View File

@ -36,10 +36,10 @@ main(void)
#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"
@ -55,17 +55,17 @@ main(void)
/* this selects from "second" which was opened last */
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select current_database () ", ECPGt_EOIT,
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "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", 0, ECPGst_normal, "select current_database () ", ECPGt_EOIT,
{ ECPGdo(__LINE__, 0, 1, "first", 0, ECPGst_normal, "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", 0, ECPGst_normal, "select current_database () ", ECPGt_EOIT,
{ ECPGdo(__LINE__, 0, 1, "second", 0, ECPGst_normal, "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"
@ -74,7 +74,7 @@ main(void)
{ ECPGsetconn(__LINE__, "first");}
#line 32 "test2.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select current_database () ", ECPGt_EOIT,
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "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"
@ -84,7 +84,7 @@ main(void)
{ ECPGdisconnect(__LINE__, "CURRENT");}
#line 36 "test2.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select current_database () ", ECPGt_EOIT,
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "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"

10
src/interfaces/ecpg/test/expected/connect-test2.stderr
View File

@ -4,7 +4,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 28: query: select current_database () ; with 0 parameter(s) on connection second
[NO_PID]: ecpg_execute on line 28: query: select current_database ( ) ; with 0 parameter(s) on connection second
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 28: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
@ -12,7 +12,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_get_data on line 28: RESULT: regress1 offset: -1; array: yes
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 29: query: select current_database () ; with 0 parameter(s) on connection first
[NO_PID]: ecpg_execute on line 29: query: select current_database ( ) ; with 0 parameter(s) on connection first
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 29: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
@ -20,7 +20,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_get_data on line 29: RESULT: connectdb offset: -1; array: yes
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 30: query: select current_database () ; with 0 parameter(s) on connection second
[NO_PID]: ecpg_execute on line 30: query: select current_database ( ) ; with 0 parameter(s) on connection second
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 30: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
@ -28,7 +28,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_get_data on line 30: RESULT: regress1 offset: -1; array: yes
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 33: query: select current_database () ; with 0 parameter(s) on connection first
[NO_PID]: ecpg_execute on line 33: query: select current_database ( ) ; with 0 parameter(s) on connection first
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 33: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
@ -38,7 +38,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection first closed
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 37: query: select current_database () ; with 0 parameter(s) on connection second
[NO_PID]: ecpg_execute on line 37: query: select current_database ( ) ; with 0 parameter(s) on connection second
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 37: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000

8
src/interfaces/ecpg/test/expected/connect-test3.c
View File

@ -35,10 +35,10 @@ main(void)
#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"
@ -54,7 +54,7 @@ main(void)
/* this selects from "second" which was opened last */
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select current_database () ", ECPGt_EOIT,
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "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"
@ -64,7 +64,7 @@ main(void)
{ ECPGdisconnect(__LINE__, "CURRENT");}
#line 30 "test3.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select current_database () ", ECPGt_EOIT,
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "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"

4
src/interfaces/ecpg/test/expected/connect-test3.stderr
View File

@ -4,7 +4,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 27: query: select current_database () ; with 0 parameter(s) on connection second
[NO_PID]: ecpg_execute on line 27: query: select current_database ( ) ; with 0 parameter(s) on connection second
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 27: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
@ -14,7 +14,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection second closed
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 31: query: select current_database () ; with 0 parameter(s) on connection first
[NO_PID]: ecpg_execute on line 31: query: select current_database ( ) ; with 0 parameter(s) on connection first
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 31: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000

6
src/interfaces/ecpg/test/expected/connect-test5.c
View File

@ -27,10 +27,10 @@ main(void)
#line 16 "test5.pgc"
char db [ 200 ] ;
char db [ 200 ] ;
#line 17 "test5.pgc"
char id [ 200 ] ;
char id [ 200 ] ;
#line 18 "test5.pgc"
char * user = "connectuser" ;
@ -43,7 +43,7 @@ main(void)
{ ECPGconnect(__LINE__, 0, "connectdb" , NULL, NULL , "main", 0); }
#line 23 "test5.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);}
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);}
#line 24 "test5.pgc"
{ ECPGdisconnect(__LINE__, "CURRENT");}

2
src/interfaces/ecpg/test/expected/connect-test5.stderr
View File

@ -2,7 +2,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 24: query: alter user connectuser encrypted password 'connectpw'; with 0 parameter(s) on connection main
[NO_PID]: ecpg_execute on line 24: query: alter user connectuser encrypted password 'connectpw'; with 0 parameter(s) on connection main
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 24: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000

2
src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c
View File

@ -416,7 +416,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
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 ( );}

2
src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stderr
View File

@ -36,7 +36,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_get_data on line 37: RESULT: 2000-07-12 17:34:29 offset: -1; array: yes
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 350: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 350: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

2
src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c
View File

@ -141,7 +141,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
PGTYPESnumeric_free(value2);
PGTYPESnumeric_free(res);
{ ECPGtrans(__LINE__, NULL, "rollback");
{ ECPGtrans(__LINE__, NULL, "rollback ");
#line 90 "num_test.pgc"
if (sqlca.sqlcode < 0) sqlprint ( );}

2
src/interfaces/ecpg/test/expected/pgtypeslib-num_test.stderr
View File

@ -26,7 +26,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_get_data on line 66: RESULT: 2369.7000000 offset: -1; array: yes
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 90: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 90: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

8
src/interfaces/ecpg/test/expected/preproc-array_of_struct.c
View File

@ -84,13 +84,13 @@ int main( int argc, char * argv[] )
#line 26 "array_of_struct.pgc"
customer custs1 [ 10 ] ;
customer custs1 [ 10 ] ;
#line 27 "array_of_struct.pgc"
cust_ind inds [ 10 ] ;
cust_ind inds [ 10 ] ;
#line 33 "array_of_struct.pgc"
customer2 custs2 [ 10 ] ;
customer2 custs2 [ 10 ] ;
#line 38 "array_of_struct.pgc"
struct customer3 {
@ -99,7 +99,7 @@ int main( int argc, char * argv[] )
#line 37 "array_of_struct.pgc"
int phone ;
} custs3 [ 10 ] ;
} custs3 [ 10 ] ;
#line 43 "array_of_struct.pgc"
struct customer4 {

2
src/interfaces/ecpg/test/expected/preproc-autoprep.c
View File

@ -28,7 +28,7 @@ int main(int argc, char* argv[]) {
#line 10 "autoprep.pgc"
int item [ 4 ] , ind [ 4 ] , i = 1 ;
int item [ 4 ] , ind [ 4 ] , i = 1 ;
/* exec sql end declare section */
#line 11 "autoprep.pgc"

16
src/interfaces/ecpg/test/expected/preproc-define.c
View File

@ -30,7 +30,7 @@
/* exec sql type intarray is int [ 6 ] */
/* exec sql type intarray is int [ 6 ] */
#line 13 "define.pgc"
typedef int intarray[ 6];
@ -40,7 +40,7 @@ main(void)
{
/* exec sql begin declare section */
typedef char string [ 8 ] ;
typedef char string [ 8 ];
#line 21 "define.pgc"
@ -52,10 +52,10 @@ main(void)
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
@ -83,7 +83,7 @@ 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();}
@ -102,7 +102,7 @@ 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();}
@ -129,7 +129,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 48 "define.pgc"
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
#line 49 "define.pgc"
int a = amount [ i ] ;
@ -147,7 +147,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
if (sqlca.sqlcode < 0) sqlprint();}
#line 56 "define.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");
{ ECPGtrans(__LINE__, NULL, "commit ");
#line 57 "define.pgc"
if (sqlca.sqlcode < 0) sqlprint();}

6
src/interfaces/ecpg/test/expected/preproc-define.stderr
View File

@ -8,7 +8,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 36: OK: CREATE TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 37: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 37: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 39: query: insert into Test ( name , amount , letter ) values ( 'false' , 1 , 'f' ) ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -22,7 +22,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 40: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 41: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 41: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 43: query: select * from test ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -48,7 +48,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 56: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 57: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 57: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

12
src/interfaces/ecpg/test/expected/preproc-init.c
View File

@ -206,7 +206,7 @@ int main(void)
/* exec sql whenever sqlerror do fa ( ) ; */
#line 87 "init.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now () ", ECPGt_EOIT, ECPGt_EORT);
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( ) ", ECPGt_EOIT, ECPGt_EORT);
#line 88 "init.pgc"
if (sqlca.sqlcode < 0) fa ( );}
@ -215,7 +215,7 @@ if (sqlca.sqlcode < 0) fa ( );}
/* exec sql whenever sqlerror do fb ( 20 ) ; */
#line 89 "init.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now () ", ECPGt_EOIT, ECPGt_EORT);
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( ) ", ECPGt_EOIT, ECPGt_EORT);
#line 90 "init.pgc"
if (sqlca.sqlcode < 0) fb ( 20 );}
@ -224,7 +224,7 @@ if (sqlca.sqlcode < 0) fb ( 20 );}
/* exec sql whenever sqlerror do fc ( \"50\" ) ; */
#line 91 "init.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now () ", ECPGt_EOIT, ECPGt_EORT);
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( ) ", ECPGt_EOIT, ECPGt_EORT);
#line 92 "init.pgc"
if (sqlca.sqlcode < 0) fc ( "50" );}
@ -233,7 +233,7 @@ if (sqlca.sqlcode < 0) fc ( "50" );}
/* exec sql whenever sqlerror do fd ( \"50\" , 1 ) ; */
#line 93 "init.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now () ", ECPGt_EOIT, ECPGt_EORT);
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( ) ", ECPGt_EOIT, ECPGt_EORT);
#line 94 "init.pgc"
if (sqlca.sqlcode < 0) fd ( "50" , 1 );}
@ -242,7 +242,7 @@ if (sqlca.sqlcode < 0) fd ( "50" , 1 );}
/* exec sql whenever sqlerror do fe ( ENUM0 ) ; */
#line 95 "init.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now () ", ECPGt_EOIT, ECPGt_EORT);
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( ) ", ECPGt_EOIT, ECPGt_EORT);
#line 96 "init.pgc"
if (sqlca.sqlcode < 0) fe ( ENUM0 );}
@ -251,7 +251,7 @@ if (sqlca.sqlcode < 0) fe ( ENUM0 );}
/* exec sql whenever sqlerror do sqlnotice ( NULL , 0 ) ; */
#line 97 "init.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now () ", ECPGt_EOIT, ECPGt_EORT);
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( ) ", ECPGt_EOIT, ECPGt_EORT);
#line 98 "init.pgc"
if (sqlca.sqlcode < 0) sqlnotice ( NULL , 0 );}

8
src/interfaces/ecpg/test/expected/preproc-type.c
View File

@ -40,7 +40,7 @@ typedef short mmSmallInt ;
#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];
@ -62,7 +62,7 @@ struct TBempl {
mmInteger idnum ;
#line 20 "type.pgc"
mmChar name [ 21 ] ;
mmChar name [ 21 ] ;
#line 21 "type.pgc"
mmSmallInt accs ;
@ -98,13 +98,13 @@ main (void)
int len ;
#line 35 "type.pgc"
char text [ 10 ] ;
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);

6
src/interfaces/ecpg/test/expected/preproc-variable.c
View File

@ -42,7 +42,7 @@ typedef char* c;
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"
@ -175,7 +175,7 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "commit");
{ ECPGtrans(__LINE__, NULL, "commit");
{ ECPGtrans(__LINE__, NULL, "commit ");
#line 59 "variable.pgc"
if (sqlca.sqlcode < 0) exit (1);}
@ -250,7 +250,7 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "commit");
{ ECPGtrans(__LINE__, NULL, "commit");
{ ECPGtrans(__LINE__, NULL, "commit ");
#line 94 "variable.pgc"
if (sqlca.sqlcode < 0) exit (1);}

4
src/interfaces/ecpg/test/expected/preproc-variable.stderr
View File

@ -44,7 +44,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 56: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 59: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 59: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 62: query: declare cur cursor for select name , born , age , married , children from family ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -162,7 +162,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 91: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 94: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 94: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

16
src/interfaces/ecpg/test/expected/preproc-whenever.c
View File

@ -51,7 +51,7 @@ int main(void)
#line 27 "whenever.pgc"
char c [ 6 ] ;
char c [ 6 ] ;
#line 27 "whenever.pgc"
@ -93,7 +93,7 @@ if (sqlca.sqlwarn[0] == 'W') warn ( );
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 ( );
@ -114,7 +114,7 @@ if (sqlca.sqlwarn[0] == 'W') warn ( );
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 ( );
@ -138,7 +138,7 @@ if (sqlca.sqlwarn[0] == 'W') warn ( );
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 ( );
@ -162,7 +162,7 @@ if (sqlca.sqlwarn[0] == 'W') warn ( );
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 ( );
@ -183,7 +183,7 @@ if (sqlca.sqlcode < 0) print2 ( );}
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 ( );}
@ -207,7 +207,7 @@ if (sqlca.sqlcode < 0) goto error;}
printf("Should not be reachable\n");
error:
{ ECPGtrans(__LINE__, NULL, "rollback");
{ ECPGtrans(__LINE__, NULL, "rollback ");
#line 59 "whenever.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( );
@ -233,7 +233,7 @@ if (sqlca.sqlwarn[0] == 'W') warn ( );
if (sqlca.sqlcode < 0) exit (1);}
#line 64 "whenever.pgc"
{ ECPGtrans(__LINE__, NULL, "rollback");
{ ECPGtrans(__LINE__, NULL, "rollback ");
#line 65 "whenever.pgc"
if (sqlca.sqlwarn[0] == 'W') warn ( );

14
src/interfaces/ecpg/test/expected/preproc-whenever.stderr
View File

@ -25,7 +25,7 @@
[NO_PID]: ecpg_get_data on line 36: RESULT: abcdefghij offset: -1; array: yes
[NO_PID]: sqlca: code: 0, state: 00000
Warning: At least one column was truncated
[NO_PID]: ECPGtrans on line 37: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 37: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 39: query: select * from nonexistant ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -38,7 +38,7 @@ LINE 1: select * from nonexistant
[NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 39: relation "nonexistant" does not exist on line 39
[NO_PID]: sqlca: code: -400, state: 42P01
sql error: relation "nonexistant" does not exist on line 39
[NO_PID]: ECPGtrans on line 40: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 40: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 43: query: select * from nonexistant ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -52,7 +52,7 @@ LINE 1: select * from nonexistant
[NO_PID]: sqlca: code: -400, state: 42P01
Error in statement 'select':
sql error: relation "nonexistant" does not exist on line 43
[NO_PID]: ECPGtrans on line 44: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 44: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 47: query: select * from nonexistant ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -66,7 +66,7 @@ LINE 1: select * from nonexistant
[NO_PID]: sqlca: code: -400, state: 42P01
Found another error
sql error: relation "nonexistant" does not exist on line 47
[NO_PID]: ECPGtrans on line 48: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 48: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 51: query: select * from nonexistant ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -78,7 +78,7 @@ LINE 1: select * from nonexistant
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 51: relation "nonexistant" does not exist on line 51
[NO_PID]: sqlca: code: -400, state: 42P01
[NO_PID]: ECPGtrans on line 52: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 52: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 55: query: select * from nonexistant ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -90,7 +90,7 @@ LINE 1: select * from nonexistant
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 55: relation "nonexistant" does not exist on line 55
[NO_PID]: sqlca: code: -400, state: 42P01
[NO_PID]: ECPGtrans on line 59: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 59: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 64: query: select 1 ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -100,5 +100,5 @@ LINE 1: select * from nonexistant
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_get_data on line 64: RESULT: 1 offset: -1; array: yes
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 65: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 65: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000

14
src/interfaces/ecpg/test/expected/sql-array.c
View File

@ -115,10 +115,10 @@ main (void)
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 ) ;
@ -148,14 +148,14 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 29 "array.pgc"
{ ECPGtrans(__LINE__, NULL, "begin transaction ");
{ ECPGtrans(__LINE__, NULL, "begin work ");
#line 31 "array.pgc"
if (sqlca.sqlcode < 0) sqlprint();}
#line 31 "array.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test ( f float , i int , a int [ 10 ] , text char ( 10 ) ) ", ECPGt_EOIT, ECPGt_EORT);
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "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();}
@ -193,14 +193,14 @@ 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();}
#line 41 "array.pgc"
{ ECPGtrans(__LINE__, NULL, "begin transaction ");
{ ECPGtrans(__LINE__, NULL, "begin work ");
#line 43 "array.pgc"
if (sqlca.sqlcode < 0) sqlprint();}
@ -259,7 +259,7 @@ 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();}

10
src/interfaces/ecpg/test/expected/sql-array.stderr
View File

@ -4,9 +4,9 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGsetcommit on line 29: action "on"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 31: action "begin transaction "; connection "regress1"
[NO_PID]: ECPGtrans on line 31: action "begin work "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 33: query: create table test ( f float , i int , a int [ 10 ] , text char ( 10 ) ) ; with 0 parameter(s) on connection regress1
[NO_PID]: ecpg_execute on line 33: query: create table test ( f float , i int , a int [ 10 ] , text char ( 10 ) ) ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 33: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
@ -40,9 +40,9 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 39: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 41: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 41: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 43: action "begin transaction "; connection "regress1"
[NO_PID]: ECPGtrans on line 43: action "begin work "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 45: query: select f , text from test where i = 1 ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -84,7 +84,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 70: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 72: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 72: action "commit "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

4
src/interfaces/ecpg/test/expected/sql-binary.c
View File

@ -34,13 +34,13 @@ struct TBempl {
long idnum ;
#line 10 "binary.pgc"
char name [ 21 ] ;
char name [ 21 ] ;
#line 11 "binary.pgc"
short accs ;
#line 12 "binary.pgc"
char byte [ 20 ] ;
char byte [ 20 ] ;
} ;/* exec sql end declare section */
#line 14 "binary.pgc"

6
src/interfaces/ecpg/test/expected/sql-code100.c
View File

@ -114,7 +114,7 @@ int main(int argc, char **argv)
#line 20 "code100.pgc"
if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit work");}
#line 22 "code100.pgc"
if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
@ -127,7 +127,7 @@ int main(int argc, char **argv)
if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
}
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit work");}
#line 31 "code100.pgc"
if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
@ -151,7 +151,7 @@ int main(int argc, char **argv)
#line 44 "code100.pgc"
if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit work");}
#line 46 "code100.pgc"
if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);

6
src/interfaces/ecpg/test/expected/sql-code100.stderr
View File

@ -8,7 +8,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 18: OK: CREATE TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 22: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 22: action "commit work"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1 ) ; with 1 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -90,7 +90,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 31: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 31: action "commit work"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 34: query: update test set payload = payload + 1 where index = - 1 ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -122,7 +122,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 44: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 46: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 46: action "commit work"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

2
src/interfaces/ecpg/test/expected/sql-copystdout.c
View File

@ -141,7 +141,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
/* EXEC SQL COPY foo TO:fname WITH DELIMITER ','; */
/* printf ("copy to /tmp/foo : sqlca.sqlcode = %ld", sqlca.sqlcode); */
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "copy foo to stdout with delimiter ','", ECPGt_EOIT, ECPGt_EORT);
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "copy foo to stdout with delimiter ','", ECPGt_EOIT, ECPGt_EORT);
#line 29 "copystdout.pgc"
if (sqlca.sqlcode < 0) sqlprint();}

2
src/interfaces/ecpg/test/expected/sql-copystdout.stderr
View File

@ -26,7 +26,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 23: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 29: query: copy foo to stdout with delimiter ','; with 0 parameter(s) on connection regress1
[NO_PID]: ecpg_execute on line 29: query: copy foo to stdout with delimiter ','; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 29: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000

2
src/interfaces/ecpg/test/expected/sql-define.c
View File

@ -102,7 +102,7 @@ int main(void)
int i ;
#line 11 "define.pgc"
char s [ 200 ] ;
char s [ 200 ] ;
/* exec sql end declare section */
#line 12 "define.pgc"

2
src/interfaces/ecpg/test/expected/sql-desc.c
View File

@ -48,7 +48,7 @@ main(void)
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 ;

2
src/interfaces/ecpg/test/expected/sql-dynalloc2.c
View File

@ -240,7 +240,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
if (sqlca.sqlcode < 0) sqlprint ( );
#line 51 "dynalloc2.pgc"
{ ECPGtrans(__LINE__, NULL, "rollback");
{ ECPGtrans(__LINE__, NULL, "rollback ");
#line 52 "dynalloc2.pgc"
if (sqlca.sqlcode < 0) sqlprint ( );}

2
src/interfaces/ecpg/test/expected/sql-dynalloc2.stderr
View File

@ -92,7 +92,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_get_data on line 36: RESULT: offset: -1; array: yes
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 52: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 52: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

4
src/interfaces/ecpg/test/expected/sql-dyntest.c
View File

@ -184,10 +184,10 @@ main (int argc, char **argv)
int DATETIME_INTERVAL_CODE ;
#line 28 "dyntest.pgc"
char NAME [ 120 ] , BOOLVAR ;
char NAME [ 120 ] , BOOLVAR ;
#line 29 "dyntest.pgc"
char STRINGVAR [ 1024 ] ;
char STRINGVAR [ 1024 ] ;
#line 30 "dyntest.pgc"
double DOUBLEVAR ;

20
src/interfaces/ecpg/test/expected/sql-execute.c
View File

@ -38,19 +38,19 @@ main(void)
#line 14 "execute.pgc"
int amount [ 8 ] ;
int amount [ 8 ] ;
#line 15 "execute.pgc"
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"
@ -70,7 +70,7 @@ 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();}
@ -121,7 +121,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
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();}
@ -168,7 +168,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 58 "execute.pgc"
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
#line 59 "execute.pgc"
int a = amount [ i ] ;
@ -235,7 +235,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 80 "execute.pgc"
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
#line 81 "execute.pgc"
int a = amount [ i ] ;
@ -290,7 +290,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 99 "execute.pgc"
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
#line 100 "execute.pgc"
int a = amount [ i ] ;
@ -314,7 +314,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
if (sqlca.sqlcode < 0) sqlprint();}
#line 108 "execute.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");
{ ECPGtrans(__LINE__, NULL, "commit ");
#line 109 "execute.pgc"
if (sqlca.sqlcode < 0) sqlprint();}

6
src/interfaces/ecpg/test/expected/sql-execute.stderr
View File

@ -8,7 +8,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 25: OK: CREATE TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 26: action "commit"; connection "main"
[NO_PID]: ECPGtrans on line 26: action "commit "; connection "main"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 29: query: insert into test (name, amount, letter) values ('db: ''r1''', 1, 'f'); with 0 parameter(s) on connection main
[NO_PID]: sqlca: code: 0, state: 00000
@ -38,7 +38,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 41: OK: INSERT 0 4
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 45: action "commit"; connection "main"
[NO_PID]: ECPGtrans on line 45: action "commit "; connection "main"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGprepare on line 49: name f; query: "select * from test"
[NO_PID]: sqlca: code: 0, state: 00000
@ -164,7 +164,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 108: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 109: action "commit"; connection "main"
[NO_PID]: ECPGtrans on line 109: action "commit "; connection "main"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGdeallocate on line 0: name i
[NO_PID]: sqlca: code: 0, state: 00000

2
src/interfaces/ecpg/test/expected/sql-fetch.c
View File

@ -28,7 +28,7 @@ int main(int argc, char* argv[]) {
#line 9 "fetch.pgc"
char str [ 25 ] ;
char str [ 25 ] ;
#line 10 "fetch.pgc"
int i , count = 1 ;

8
src/interfaces/ecpg/test/expected/sql-func.c
View File

@ -25,7 +25,7 @@
int main(int argc, char* argv[]) {
#line 8 "func.pgc"
char text [ 25 ] ;
char text [ 25 ] ;
#line 8 "func.pgc"
@ -64,11 +64,11 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 18 "func.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create function My_Table_Check () returns trigger as $test$\
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create function My_Table_Check ( ) returns trigger as $test$\
BEGIN\
INSERT INTO Log VALUES(TG_NAME, TG_WHEN);\
RETURN NEW;\
END; $test$ language plpgsql", ECPGt_EOIT, ECPGt_EORT);
END; $test$ language plpgsql ", ECPGt_EOIT, ECPGt_EORT);
#line 26 "func.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint();
@ -128,7 +128,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
if (sqlca.sqlcode < 0) sqlprint();}
#line 39 "func.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop function My_Table_Check () ", ECPGt_EOIT, ECPGt_EORT);
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop function My_Table_Check ( ) ", ECPGt_EOIT, ECPGt_EORT);
#line 40 "func.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint();

4
src/interfaces/ecpg/test/expected/sql-func.stderr
View File

@ -16,7 +16,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 18: OK: CREATE TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 20: query: create function My_Table_Check () returns trigger as $test$ BEGIN INSERT INTO Log VALUES(TG_NAME, TG_WHEN); RETURN NEW; END; $test$ language plpgsql; with 0 parameter(s) on connection regress1
[NO_PID]: ecpg_execute on line 20: query: create function My_Table_Check ( ) returns trigger as $test$ BEGIN INSERT INTO Log VALUES(TG_NAME, TG_WHEN); RETURN NEW; END; $test$ language plpgsql ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 20: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
@ -54,7 +54,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 39: OK: DROP TRIGGER
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 40: query: drop function My_Table_Check () ; with 0 parameter(s) on connection regress1
[NO_PID]: ecpg_execute on line 40: query: drop function My_Table_Check ( ) ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 40: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000

6
src/interfaces/ecpg/test/expected/sql-indicators.c
View File

@ -119,7 +119,7 @@ int main(int argc, char **argv)
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table indicator_test ( \"id\" int primary key , \"str\" text not null , val int null ) ", ECPGt_EOIT, ECPGt_EORT);}
#line 22 "indicators.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit work");}
#line 23 "indicators.pgc"
@ -139,7 +139,7 @@ int main(int argc, char **argv)
ECPGt_int,&(nullind),(long)1,(long)1,sizeof(int), ECPGt_EOIT, ECPGt_EORT);}
#line 30 "indicators.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit work");}
#line 31 "indicators.pgc"
@ -179,7 +179,7 @@ int main(int argc, char **argv)
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table indicator_test ", ECPGt_EOIT, ECPGt_EORT);}
#line 46 "indicators.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit work");}
#line 47 "indicators.pgc"

6
src/interfaces/ecpg/test/expected/sql-indicators.stderr
View File

@ -10,7 +10,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 19: OK: CREATE TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 23: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 23: action "commit work"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 25: query: insert into indicator_test ( id , str , val ) values ( 1 , 'Hello' , 0 ) ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -34,7 +34,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 30: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 31: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 31: action "commit work"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 34: query: select val from indicator_test where id = 1 ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -82,7 +82,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 46: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 47: action "commit"; connection "regress1"
[NO_PID]: ECPGtrans on line 47: action "commit work"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

4
src/interfaces/ecpg/test/expected/sql-insupd.c
View File

@ -27,7 +27,7 @@ int main(int argc, char* argv[]) {
#line 9 "insupd.pgc"
int i1 [ 3 ] , i2 [ 3 ] ;
int i1 [ 3 ] , i2 [ 3 ] ;
/* exec sql end declare section */
#line 10 "insupd.pgc"
@ -91,7 +91,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
if (sqlca.sqlcode < 0) sqlprint();}
#line 24 "insupd.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update insupd_test set ( a , b )= ( 5 , 5 ) where a = 4 ", ECPGt_EOIT, ECPGt_EORT);
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update insupd_test set ( a , b ) = ( 5 , 5 ) where a = 4 ", ECPGt_EOIT, ECPGt_EORT);
#line 25 "insupd.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint();

2
src/interfaces/ecpg/test/expected/sql-insupd.stderr
View File

@ -32,7 +32,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 24: OK: UPDATE 3
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 25: query: update insupd_test set ( a , b )= ( 5 , 5 ) where a = 4 ; with 0 parameter(s) on connection regress1
[NO_PID]: ecpg_execute on line 25: query: update insupd_test set ( a , b ) = ( 5 , 5 ) where a = 4 ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 25: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000

18
src/interfaces/ecpg/test/expected/sql-oldexec.c
View File

@ -38,19 +38,19 @@ main(void)
#line 14 "oldexec.pgc"
int amount [ 8 ] ;
int amount [ 8 ] ;
#line 15 "oldexec.pgc"
int increment = 100 ;
#line 16 "oldexec.pgc"
char name [ 8 ] [ 8 ] ;
char name [ 8 ] [ 8 ] ;
#line 17 "oldexec.pgc"
char letter [ 8 ] [ 1 ] ;
char letter [ 8 ] [ 1 ] ;
#line 18 "oldexec.pgc"
char command [ 128 ] ;
char command [ 128 ] ;
/* exec sql end declare section */
#line 19 "oldexec.pgc"
@ -70,7 +70,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
if (sqlca.sqlcode < 0) sqlprint();}
#line 25 "oldexec.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");
{ ECPGtrans(__LINE__, NULL, "commit ");
#line 26 "oldexec.pgc"
if (sqlca.sqlcode < 0) sqlprint();}
@ -121,7 +121,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
printf("Inserted %ld tuples via prepared execute\n", sqlca.sqlerrd[2]);
{ ECPGtrans(__LINE__, NULL, "commit");
{ ECPGtrans(__LINE__, NULL, "commit ");
#line 45 "oldexec.pgc"
if (sqlca.sqlcode < 0) sqlprint();}
@ -168,7 +168,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 58 "oldexec.pgc"
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
#line 59 "oldexec.pgc"
int a = amount [ i ] ;
@ -229,7 +229,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 79 "oldexec.pgc"
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
char n [ 8 ] , l = letter [ i ] [ 0 ] ;
#line 80 "oldexec.pgc"
int a = amount [ i ] ;
@ -253,7 +253,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
if (sqlca.sqlcode < 0) sqlprint();}
#line 88 "oldexec.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");
{ ECPGtrans(__LINE__, NULL, "commit ");
#line 89 "oldexec.pgc"
if (sqlca.sqlcode < 0) sqlprint();}

6
src/interfaces/ecpg/test/expected/sql-oldexec.stderr
View File

@ -8,7 +8,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 25: OK: CREATE TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 26: action "commit"; connection "main"
[NO_PID]: ECPGtrans on line 26: action "commit "; connection "main"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 29: query: insert into test (name, amount, letter) values ('db: ''r1''', 1, 'f'); with 0 parameter(s) on connection main
[NO_PID]: sqlca: code: 0, state: 00000
@ -38,7 +38,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 41: OK: INSERT 0 4
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 45: action "commit"; connection "main"
[NO_PID]: ECPGtrans on line 45: action "commit "; connection "main"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGprepare on line 49: name f; query: "select * from test"
[NO_PID]: sqlca: code: 0, state: 00000
@ -144,7 +144,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 88: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 89: action "commit"; connection "main"
[NO_PID]: ECPGtrans on line 89: action "commit "; connection "main"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGdeallocate on line 0: name f
[NO_PID]: sqlca: code: 0, state: 00000

2
src/interfaces/ecpg/test/expected/sql-parser.c
View File

@ -28,7 +28,7 @@ int main(int argc, char* argv[]) {
#line 10 "parser.pgc"
int item [ 3 ] , ind [ 3 ] , i ;
int item [ 3 ] , ind [ 3 ] , i ;
/* exec sql end declare section */
#line 11 "parser.pgc"

6
src/interfaces/ecpg/test/expected/sql-quote.c
View File

@ -28,7 +28,7 @@ int main(int argc, char* argv[]) {
#line 9 "quote.pgc"
char var [ 25 ] ;
char var [ 25 ] ;
#line 10 "quote.pgc"
int i ;
@ -126,7 +126,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 35 "quote.pgc"
{ ECPGtrans(__LINE__, NULL, "begin transaction ");
{ ECPGtrans(__LINE__, NULL, "begin ");
#line 37 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint();
@ -174,7 +174,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
printf("value: %d %s\n", i, var);
}
{ ECPGtrans(__LINE__, NULL, "rollback");
{ ECPGtrans(__LINE__, NULL, "rollback ");
#line 50 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint();

4
src/interfaces/ecpg/test/expected/sql-quote.stderr
View File

@ -53,7 +53,7 @@ sql error: nonstandard use of \\ in a string literal
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 35: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 37: action "begin transaction "; connection "regress1"
[NO_PID]: ECPGtrans on line 37: action "begin "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 40: query: declare C cursor for select * from "My_Table" ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
@ -109,7 +109,7 @@ sql error: nonstandard use of \\ in a string literal
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode 100 on line 46: no data found on line 46
[NO_PID]: sqlca: code: 100, state: 02000
[NO_PID]: ECPGtrans on line 50: action "rollback"; connection "regress1"
[NO_PID]: ECPGtrans on line 50: action "rollback "; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 51: query: drop table "My_Table" ; with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000

2
src/interfaces/ecpg/test/expected/sql-show.c
View File

@ -27,7 +27,7 @@ int main(int argc, char* argv[]) {
#line 9 "show.pgc"
char var [ 25 ] = "public" ;
char var [ 25 ] = "public" ;
/* exec sql end declare section */
#line 10 "show.pgc"

2
src/interfaces/ecpg/test/expected/thread-alloc.c
View File

@ -136,7 +136,7 @@ static void* fn(void* arg)
int value ;
#line 40 "alloc.pgc"
char name [ 100 ] ;
char name [ 100 ] ;
#line 41 "alloc.pgc"
char ** r = NULL ;

4
src/interfaces/ecpg/test/expected/thread-prep.c
View File

@ -136,10 +136,10 @@ static void* fn(void* arg)
int value ;
#line 40 "prep.pgc"
char name [ 100 ] ;
char name [ 100 ] ;
#line 41 "prep.pgc"
char query [ 256 ] = "INSERT INTO T VALUES ( ? )" ;
char query [ 256 ] = "INSERT INTO T VALUES ( ? )" ;
/* exec sql end declare section */
#line 42 "prep.pgc"

16
src/interfaces/ecpg/test/expected/thread-thread.c
View File

@ -72,13 +72,13 @@ int main(int argc, char *argv[])
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test_thread ", ECPGt_EOIT, ECPGt_EORT);}
#line 47 "thread.pgc"
/* DROP might fail */
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit ");}
#line 48 "thread.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "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, 0, ECPGst_normal, "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 53 "thread.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit ");}
#line 54 "thread.pgc"
{ ECPGdisconnect(__LINE__, "CURRENT");}
@ -116,12 +116,12 @@ int main(int argc, char *argv[])
{ ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); }
#line 85 "thread.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select count (*) from test_thread ", ECPGt_EOIT,
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "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 86 "thread.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit ");}
#line 87 "thread.pgc"
{ ECPGdisconnect(__LINE__, "CURRENT");}
@ -146,7 +146,7 @@ void *test_thread(void *arg)
int l_i ;
#line 102 "thread.pgc"
char l_connection [ 128 ] ;
char l_connection [ 128 ] ;
/* exec sql end declare section */
#line 103 "thread.pgc"
@ -171,7 +171,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
printf("%s: ERROR: cannot connect to database!\n", l_connection);
return( NULL );
}
{ ECPGtrans(__LINE__, l_connection, "begin transaction ");
{ ECPGtrans(__LINE__, l_connection, "begin ");
#line 118 "thread.pgc"
if (sqlca.sqlcode < 0) sqlprint();}
@ -196,7 +196,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
}
/* all done */
{ ECPGtrans(__LINE__, l_connection, "commit");
{ ECPGtrans(__LINE__, l_connection, "commit ");
#line 129 "thread.pgc"
if (sqlca.sqlcode < 0) sqlprint();}

16
src/interfaces/ecpg/test/expected/thread-thread_implicit.c
View File

@ -73,13 +73,13 @@ int main(int argc, char *argv[])
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test_thread ", ECPGt_EOIT, ECPGt_EORT);}
#line 48 "thread_implicit.pgc"
/* DROP might fail */
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit ");}
#line 49 "thread_implicit.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "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, 0, ECPGst_normal, "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 54 "thread_implicit.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit ");}
#line 55 "thread_implicit.pgc"
{ ECPGdisconnect(__LINE__, "CURRENT");}
@ -117,12 +117,12 @@ int main(int argc, char *argv[])
{ ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); }
#line 86 "thread_implicit.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select count (*) from test_thread ", ECPGt_EOIT,
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "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 87 "thread_implicit.pgc"
{ ECPGtrans(__LINE__, NULL, "commit");}
{ ECPGtrans(__LINE__, NULL, "commit ");}
#line 88 "thread_implicit.pgc"
{ ECPGdisconnect(__LINE__, "CURRENT");}
@ -147,7 +147,7 @@ void *test_thread(void *arg)
int l_i ;
#line 103 "thread_implicit.pgc"
char l_connection [ 128 ] ;
char l_connection [ 128 ] ;
/* exec sql end declare section */
#line 104 "thread_implicit.pgc"
@ -172,7 +172,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
printf("%s: ERROR: cannot connect to database!\n", l_connection);
return( NULL );
}
{ ECPGtrans(__LINE__, NULL, "begin transaction ");
{ ECPGtrans(__LINE__, NULL, "begin ");
#line 119 "thread_implicit.pgc"
if (sqlca.sqlcode < 0) sqlprint();}
@ -197,7 +197,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
}
/* all done */
{ ECPGtrans(__LINE__, NULL, "commit");
{ ECPGtrans(__LINE__, NULL, "commit ");
#line 130 "thread_implicit.pgc"
if (sqlca.sqlcode < 0) sqlprint();}