Commit98bdaab

Michael Meskes

committed

Fix ecpglib regression that made it impossible to close a cursor that was

opened in a prepared statement.Patch by: "Kuroda, Hayato" <kuroda.hayato@jp.fujitsu.com>

1 parent3c06715 commit98bdaabCopy full SHA for 98bdaab

File tree

+11

-8

lines changed

+11

-8

lines changed

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,20 +150,23 @@ ECPGclose(const char *cursor_name,`
`150`	`150`
`151`	`151`	`con=ecpg_get_connection(real_connection_name);`
`152`	`152`
`153`		`-/* check the existence of the cursor in the connection */`
`154`		`-if (find_cursor(cursor_name,con)== false)`
`155`		`-{`
`156`		`-ecpg_raise(lineno,ECPG_INVALID_CURSOR,ECPG_SQLSTATE_ECPG_INTERNAL_ERROR,NULL);`
`157`		`-return false;`
`158`		`-}`
`159`		`-`
	`153`	`+/* send the query to backend */`
`160`	`154`	`va_start(args,query);`
`161`	`155`
`162`	`156`	`status=ecpg_do(lineno,compat,force_indicator,real_connection_name,questionmarks,st,query,args);`
`163`	`157`
`164`	`158`	`va_end(args);`
`165`	`159`
`166`		`-remove_cursor(cursor_name,con);`
	`160`	`+/* if it fails, raise an error */`
	`161`	`+if (!status)`
	`162`	`+{`
	`163`	`+ecpg_raise(lineno,ECPG_INVALID_CURSOR,ECPG_SQLSTATE_ECPG_INTERNAL_ERROR,NULL);`
	`164`	`+return false;`
	`165`	`+}`
	`166`	`+`
	`167`	`+/* check the existence of the cursor in the connection */`
	`168`	`+if (find_cursor(cursor_name,con)== true)`
	`169`	`+remove_cursor(cursor_name,con);`
`167`	`170`
`168`	`171`	`returnstatus;`
`169`	`172`	`}`

Comments

(0)