NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite400840

Michael Meskes

committed

Fix closing of incorrectly named cursor.

Patch by "Shinoda, Noriyoshi" <noriyoshi.shinoda@hpe.com>

1 parente3bdb2d commite400840Copy full SHA for e400840

File tree

3 files changed

-12

lines changed

src/interfaces/ecpg/test
- compat_oracle
  - char_array.pgc
- expected
  - compat_oracle-char_array.c
  - compat_oracle-char_array.stderr

3 files changed

-12

lines changed

`‎src/interfaces/ecpg/test/compat_oracle/char_array.pgc`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ int main() {`
`51`	`51`	`printf("\"%s\": \"%s\" %d\n", bigstr, shortstr, shstr_ind);`
`52`	`52`	`}`
`53`	`53`
`54`		`- EXEC SQLclose cstr;`
	`54`	`+ EXEC SQLCLOSE C;`
`55`	`55`	`EXEC SQL DROP TABLE strdbase;`
`56`	`56`
`57`	`57`	`printf("\nGOOD-BYE!!\n\n");`

`‎src/interfaces/ecpg/test/expected/compat_oracle-char_array.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,15 +178,15 @@ if (sqlca.sqlcode < 0) sqlprint();}`
`178`	`178`	`printf("\"%s\": \"%s\" %d\n",bigstr,shortstr,shstr_ind);`
`179`	`179`	`}`
`180`	`180`
`181`		`- {ECPGdo(__LINE__,3,1,NULL,0,ECPGst_normal,"closecstr",ECPGt_EOIT,ECPGt_EORT);`
	`181`	`+ {ECPGdo(__LINE__,3,1,NULL,0,ECPGst_normal,"closeC",ECPGt_EOIT,ECPGt_EORT);`
`182`	`182`	`#line 54 "char_array.pgc"`
`183`	`183`
`184`	`184`	`if (sqlca.sqlwarn[0]=='W')warn ( );`
`185`	`185`	`#line 54 "char_array.pgc"`
`186`	`186`
`187`	`187`	`if (sqlca.sqlcode<0)sqlprint();}`
`188`	`188`	`#line 54 "char_array.pgc"`
`189`		`-`
	`189`	`+`
`190`	`190`	`{ECPGdo(__LINE__,3,1,NULL,0,ECPGst_normal,"drop table strdbase",ECPGt_EOIT,ECPGt_EORT);`
`191`	`191`	`#line 55 "char_array.pgc"`
`192`	`192`

`‎src/interfaces/ecpg/test/expected/compat_oracle-char_array.stderr`

Lines changed: 3 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -121,24 +121,18 @@ Warning: At least one column was truncated`
`121`	`121`	`[NO_PID]: sqlca: code: 0, state: 00000`
`122`	`122`	`[NO_PID]: raising sqlcode 100 on line 50: no data found on line 50`
`123`	`123`	`[NO_PID]: sqlca: code: 100, state: 02000`
`124`		`-[NO_PID]: ecpg_execute on line 54: query: closecstr; with 0 parameter(s) on connection ecpg1_regression`
	`124`	`+[NO_PID]: ecpg_execute on line 54: query: closeC; with 0 parameter(s) on connection ecpg1_regression`
`125`	`125`	`[NO_PID]: sqlca: code: 0, state: 00000`
`126`	`126`	`[NO_PID]: ecpg_execute on line 54: using PQexec`
`127`	`127`	`[NO_PID]: sqlca: code: 0, state: 00000`
`128`		`-[NO_PID]:ecpg_check_PQresult on line 54:bad response - ERROR: cursor "cstr" does not exist`
	`128`	`+[NO_PID]:ecpg_process_output on line 54:OK: CLOSE CURSOR`
`129`	`129`	`[NO_PID]: sqlca: code: 0, state: 00000`
`130`		`-[NO_PID]: raising sqlstate 34000 (sqlcode -400): cursor "cstr" does not exist on line 54`
`131`		`-[NO_PID]: sqlca: code: -400, state: 34000`
`132`		`-SQL error: cursor "cstr" does not exist on line 54`
`133`	`130`	`[NO_PID]: ecpg_execute on line 55: query: drop table strdbase; with 0 parameter(s) on connection ecpg1_regression`
`134`	`131`	`[NO_PID]: sqlca: code: 0, state: 00000`
`135`	`132`	`[NO_PID]: ecpg_execute on line 55: using PQexec`
`136`	`133`	`[NO_PID]: sqlca: code: 0, state: 00000`
`137`		`-[NO_PID]:ecpg_check_PQresult on line 55:bad response - ERROR: current transaction is aborted, commands ignored until end of transaction block`
	`134`	`+[NO_PID]:ecpg_process_output on line 55:OK: DROP TABLE`
`138`	`135`	`[NO_PID]: sqlca: code: 0, state: 00000`
`139`		`-[NO_PID]: raising sqlstate 25P02 (sqlcode -400): current transaction is aborted, commands ignored until end of transaction block on line 55`
`140`		`-[NO_PID]: sqlca: code: -400, state: 25P02`
`141`		`-SQL error: current transaction is aborted, commands ignored until end of transaction block on line 55`
`142`	`136`	`[NO_PID]: ECPGtrans on line 59: action "commit work"; connection "ecpg1_regression"`
`143`	`137`	`[NO_PID]: sqlca: code: 0, state: 00000`
`144`	`138`	`[NO_PID]: ecpg_finish: connection ecpg1_regression closed`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite400840

File tree

3 files changed

3 files changed

`‎src/interfaces/ecpg/test/compat_oracle/char_array.pgc`

`‎src/interfaces/ecpg/test/expected/compat_oracle-char_array.c`

`‎src/interfaces/ecpg/test/expected/compat_oracle-char_array.stderr`

0 commit comments