diff options
Diffstat (limited to 'src')
3 files changed, 6 insertions, 12 deletions
diff --git a/src/interfaces/ecpg/test/compat_oracle/char_array.pgc b/src/interfaces/ecpg/test/compat_oracle/char_array.pgc index 5b5d0bb37b9..8c33b18b7c8 100644 --- a/src/interfaces/ecpg/test/compat_oracle/char_array.pgc +++ b/src/interfaces/ecpg/test/compat_oracle/char_array.pgc @@ -51,7 +51,7 @@ int main() { printf("\"%s\": \"%s\" %d\n", bigstr, shortstr, shstr_ind); } - EXEC SQL close cstr; + EXEC SQL CLOSE C; EXEC SQL DROP TABLE strdbase; printf("\nGOOD-BYE!!\n\n"); diff --git a/src/interfaces/ecpg/test/expected/compat_oracle-char_array.c b/src/interfaces/ecpg/test/expected/compat_oracle-char_array.c index a72736f673a..c2ef09e354c 100644 --- a/src/interfaces/ecpg/test/expected/compat_oracle-char_array.c +++ b/src/interfaces/ecpg/test/expected/compat_oracle-char_array.c @@ -178,7 +178,7 @@ if (sqlca.sqlcode < 0) sqlprint();} printf("\"%s\": \"%s\" %d\n", bigstr, shortstr, shstr_ind); } - { ECPGdo(__LINE__, 3, 1, NULL, 0, ECPGst_normal, "close cstr", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 3, 1, NULL, 0, ECPGst_normal, "close C", ECPGt_EOIT, ECPGt_EORT); #line 54 "char_array.pgc" if (sqlca.sqlwarn[0] == 'W') warn ( ); @@ -186,7 +186,7 @@ if (sqlca.sqlwarn[0] == 'W') warn ( ); if (sqlca.sqlcode < 0) sqlprint();} #line 54 "char_array.pgc" - + { ECPGdo(__LINE__, 3, 1, NULL, 0, ECPGst_normal, "drop table strdbase", ECPGt_EOIT, ECPGt_EORT); #line 55 "char_array.pgc" diff --git a/src/interfaces/ecpg/test/expected/compat_oracle-char_array.stderr b/src/interfaces/ecpg/test/expected/compat_oracle-char_array.stderr index 01766b63416..40d9f7ddb04 100644 --- a/src/interfaces/ecpg/test/expected/compat_oracle-char_array.stderr +++ b/src/interfaces/ecpg/test/expected/compat_oracle-char_array.stderr @@ -121,24 +121,18 @@ Warning: At least one column was truncated [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: raising sqlcode 100 on line 50: no data found on line 50 [NO_PID]: sqlca: code: 100, state: 02000 -[NO_PID]: ecpg_execute on line 54: query: close cstr; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 54: query: close C; with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 54: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_check_PQresult on line 54: bad response - ERROR: cursor "cstr" does not exist +[NO_PID]: ecpg_process_output on line 54: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlstate 34000 (sqlcode -400): cursor "cstr" does not exist on line 54 -[NO_PID]: sqlca: code: -400, state: 34000 -SQL error: cursor "cstr" does not exist on line 54 [NO_PID]: ecpg_execute on line 55: query: drop table strdbase; with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 55: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_check_PQresult on line 55: bad response - ERROR: current transaction is aborted, commands ignored until end of transaction block +[NO_PID]: ecpg_process_output on line 55: OK: DROP TABLE [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlstate 25P02 (sqlcode -400): current transaction is aborted, commands ignored until end of transaction block on line 55 -[NO_PID]: sqlca: code: -400, state: 25P02 -SQL error: current transaction is aborted, commands ignored until end of transaction block on line 55 [NO_PID]: ECPGtrans on line 59: action "commit work"; connection "ecpg1_regression" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection ecpg1_regression closed |