mirror of
https://github.com/php/php-src.git
synced 2024-11-24 10:24:11 +08:00
Ora_Fetch_Into now resets the returned array in all cases
This commit is contained in:
parent
ed731497fe
commit
820adaddf1
@ -2,6 +2,7 @@ PHP 4.0 CHANGE LOG ChangeLog
|
||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
|
||||
?? ?? 1999, Version 4.0 Beta 3
|
||||
- Ora_Fetch_Into now resets the returned array in all cases (Thies)
|
||||
- Fixed NULL-Column problem in Oracle-Driver (Thies)
|
||||
- Added extra metadata functions to ODBC, SQLTables etc (nick@easysoft.com)
|
||||
- Fixed SEGV in mcal make_event_object() (Andrew Skalski)
|
||||
|
@ -1125,22 +1125,23 @@ PHP_FUNCTION(ora_fetch_into)
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
if (arr->type != IS_ARRAY){
|
||||
if (array_init(arr) == FAILURE){
|
||||
php_error(E_WARNING, "Can't convert to type Array");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
if (ofetch(&cursor->cda)) {
|
||||
if (cursor->cda.rc != NO_DATA_FOUND) {
|
||||
php_error(E_WARNING, "Ora_Fetch_Into failed (%s)",
|
||||
ora_error(&cursor->cda));
|
||||
php_error(E_WARNING, "Ora_Fetch_Into failed (%s)",ora_error(&cursor->cda));
|
||||
}
|
||||
RETURN_FALSE;
|
||||
}
|
||||
cursor->fetched++;
|
||||
|
||||
if (arr->type != IS_ARRAY){
|
||||
pval_destructor(arr);
|
||||
if (array_init(arr) == FAILURE){
|
||||
php_error(E_WARNING, "Can't convert to type Array");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
}
|
||||
zend_hash_internal_pointer_reset(arr->value.ht);
|
||||
|
||||
for (i = 0; i < cursor->ncols; i++) {
|
||||
|
||||
if (cursor->columns[i].col_retcode == 1405) {
|
||||
|
Loading…
Reference in New Issue
Block a user