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

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

File diff suppressed because it is too large Load Diff

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

@ -148,7 +148,7 @@ 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();}
@ -200,7 +200,7 @@ 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();}

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

@ -4,7 +4,7 @@
[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]: sqlca: code: 0, state: 00000
@ -42,7 +42,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[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

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

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

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

@ -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();

2
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

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

@ -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();}

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

@ -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();}