archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fixed bug #43271 (pdo_firebird: closeCursor not implemented)

Browse source 
# Actually firebird_stmt_execute() didn't close a previously opened cursor, but implemented closeCursor anyway.
This commit is contained in:
Lars Westermann 2007-11-14 22:09:21 +00:00
parent bcc718d971
commit 32eece4bcb
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
ext/pdo_firebird/firebird_statement.c
View file

@ -92,11 +92,11 @@ static int firebird_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
pdo_firebird_db_handle *H = S->H; pdo_firebird_db_handle *H = S->H;
do { do {
/* named cursors should be closed first */ /* named or open cursors should be closed first */
if (*S->name && isc_dsql_free_statement(H->isc_status, &S->stmt, DSQL_close)) { if ((*S->name || S->cursor_open) && isc_dsql_free_statement(H->isc_status, &S->stmt, DSQL_close)) {
break; break;
} }
S->cursor_open = 0;
/* assume all params have been bound */ /* assume all params have been bound */
if ((S->statement_type == isc_info_sql_stmt_exec_procedure && if ((S->statement_type == isc_info_sql_stmt_exec_procedure &&
@ -113,6 +113,7 @@ static int firebird_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
} }
*S->name = 0; *S->name = 0;
S->cursor_open = 1;
S->exhausted = 0; S->exhausted = 0;
return 1; return 1;
@ -612,6 +613,20 @@ static int firebird_stmt_get_attribute(pdo_stmt_t *stmt, long attr, zval *val TS
} }
/* }}} */ /* }}} */
static int firebird_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
{
pdo_firebird_stmt *S = (pdo_firebird_stmt*)stmt->driver_data;
/* close the statement handle */
if (isc_dsql_free_statement(S->H->isc_status, &S->stmt, DSQL_close)) {
RECORD_ERROR(stmt);
return 0;
}
return 1;
}
/* }}} */
struct pdo_stmt_methods firebird_stmt_methods = { /* {{{ */ struct pdo_stmt_methods firebird_stmt_methods = { /* {{{ */
firebird_stmt_dtor, firebird_stmt_dtor,
firebird_stmt_execute, firebird_stmt_execute,
@ -620,7 +635,10 @@ struct pdo_stmt_methods firebird_stmt_methods = { /* {{{ */
firebird_stmt_get_col, firebird_stmt_get_col,
firebird_stmt_param_hook, firebird_stmt_param_hook,
firebird_stmt_set_attribute, firebird_stmt_set_attribute,
firebird_stmt_get_attribute firebird_stmt_get_attribute,
NULL, /* get_column_meta_func */
NULL, /* next_rowset_func */
firebird_stmt_cursor_closer
}; };
/* }}} */ /* }}} */

5
ext/pdo_firebird/php_pdo_firebird_int.h
View file

@ -102,7 +102,10 @@ typedef struct {
/* whether EOF was reached for this statement */ /* whether EOF was reached for this statement */
unsigned exhausted:1; unsigned exhausted:1;
unsigned _reserved:23; /* successful isc_dsql_execute opens a cursor */
unsigned cursor_open:1;
unsigned _reserved:22;
/* the named params that were converted to ?'s by the driver */ /* the named params that were converted to ?'s by the driver */
HashTable *named_params; HashTable *named_params;