From a1bc18dacddae1af616d1ce167cae1c246483a2c Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Thu, 1 Jul 2021 19:13:09 +0900 Subject: [PATCH v2 2/2] test part --- .../ecpg/test/expected/sql-execute.c | 29 ++++++++++++++----- .../ecpg/test/expected/sql-execute.stderr | 22 ++++++++++---- src/interfaces/ecpg/test/sql/execute.pgc | 3 ++ 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/interfaces/ecpg/test/expected/sql-execute.c b/src/interfaces/ecpg/test/expected/sql-execute.c index 10e9ad56b5..f5e9cfd664 100644 --- a/src/interfaces/ecpg/test/expected/sql-execute.c +++ b/src/interfaces/ecpg/test/expected/sql-execute.c @@ -302,29 +302,42 @@ if (sqlca.sqlcode < 0) sqlprint();} printf("name[%d]=%8.8s\tamount[%d]=%d\tletter[%d]=%c\n", i, n, i, a, i, l); } + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table newt as execute \"f\" ( 2 )", ECPGt_EOIT, ECPGt_EORT); +#line 107 "execute.pgc" + +if (sqlca.sqlcode < 0) sqlprint();} +#line 107 "execute.pgc" + + { ECPGdeallocate(__LINE__, 0, NULL, "f"); -#line 107 "execute.pgc" +#line 109 "execute.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 107 "execute.pgc" +#line 109 "execute.pgc" + + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table newt", ECPGt_EOIT, ECPGt_EORT); +#line 110 "execute.pgc" + +if (sqlca.sqlcode < 0) sqlprint();} +#line 110 "execute.pgc" { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test", ECPGt_EOIT, ECPGt_EORT); -#line 108 "execute.pgc" +#line 111 "execute.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 108 "execute.pgc" +#line 111 "execute.pgc" { ECPGtrans(__LINE__, NULL, "commit"); -#line 109 "execute.pgc" +#line 112 "execute.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 109 "execute.pgc" +#line 112 "execute.pgc" { ECPGdisconnect(__LINE__, "CURRENT"); -#line 110 "execute.pgc" +#line 113 "execute.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 110 "execute.pgc" +#line 113 "execute.pgc" return 0; diff --git a/src/interfaces/ecpg/test/expected/sql-execute.stderr b/src/interfaces/ecpg/test/expected/sql-execute.stderr index d8bc3c6524..26b72cf27f 100644 --- a/src/interfaces/ecpg/test/expected/sql-execute.stderr +++ b/src/interfaces/ecpg/test/expected/sql-execute.stderr @@ -156,15 +156,27 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_get_data on line 94: RESULT: t offset: -1; array: no [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: deallocate_one on line 107: name f +[NO_PID]: ecpg_execute on line 107: query: create table newt as execute "f" ( 2 ); with 0 parameter(s) on connection main [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 108: query: drop table test; with 0 parameter(s) on connection main +[NO_PID]: ecpg_execute on line 107: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 108: using PQexec +[NO_PID]: ecpg_process_output on line 107: OK: SELECT 1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 108: OK: DROP TABLE +[NO_PID]: deallocate_one on line 109: name f [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGtrans on line 109: action "commit"; connection "main" +[NO_PID]: ecpg_execute on line 110: query: drop table newt; with 0 parameter(s) on connection main +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ecpg_execute on line 110: using PQexec +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ecpg_process_output on line 110: OK: DROP TABLE +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ecpg_execute on line 111: query: drop table test; with 0 parameter(s) on connection main +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ecpg_execute on line 111: using PQexec +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ecpg_process_output on line 111: OK: DROP TABLE +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ECPGtrans on line 112: action "commit"; connection "main" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: deallocate_one on line 0: name i [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/sql/execute.pgc b/src/interfaces/ecpg/test/sql/execute.pgc index 43171bb77c..59f5dca963 100644 --- a/src/interfaces/ecpg/test/sql/execute.pgc +++ b/src/interfaces/ecpg/test/sql/execute.pgc @@ -104,7 +104,10 @@ exec sql end declare section; printf("name[%d]=%8.8s\tamount[%d]=%d\tletter[%d]=%c\n", i, n, i, a, i, l); } + exec sql create table newt as execute f(2); + exec sql deallocate f; + exec sql drop table newt; exec sql drop table test; exec sql commit; exec sql disconnect; -- 2.27.0