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

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

Adapted regression test files accordingly.
parent 3be24485
Branches
Tags
No related merge requests found
Showing
with 69 additions and 69 deletions
......@@ -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"
......
......@@ -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
......@@ -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();
......
......@@ -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
......
......@@ -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();}
......
......@@ -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();}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment