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

- MFB (Which was an MFH)

Browse source 
- Bug #44153 (ErrorCode returns NULL when no error)
- Bug #44154 (ErrorInfo to ALWAYS have 3 elements)
This commit is contained in:
David Coallier 2008-11-10 20:34:53 +00:00
parent 68d9aac6d2
commit a6cb5393c6
2 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ext/pdo/pdo_dbh.c
View file

@ -1002,11 +1002,16 @@ static PHP_METHOD(PDO, errorCode)
Fetch extended error information associated with the last operation on the database handle */
static PHP_METHOD(PDO, errorInfo)
{
int error_count;
int error_count_diff = 0;
int error_expected_count = 3;
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
if (zend_parse_parameters_none() == FAILURE) {
return;
}
PDO_CONSTRUCT_CHECK;
array_init(return_value);
@ -1015,12 +1020,28 @@ static PHP_METHOD(PDO, errorInfo)
add_next_index_string(return_value, dbh->query_stmt->error_code, 1);
} else {
add_next_index_string(return_value, dbh->error_code, 1);
add_next_index_null(return_value);
add_next_index_null(return_value);
}
if (dbh->methods->fetch_err) {
dbh->methods->fetch_err(dbh, dbh->query_stmt, return_value TSRMLS_CC);
}
/**
* In order to be consistent, we have to make sure we add the good amount
* of null elements depending on the current number of elements. We make
* a simple difference and add the needed elements to reach the expected
* count.
*/
error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
if (error_expected_count > error_count) {
error_count_diff = error_expected_count - error_count;
int current_index;
for (current_index = 0; current_index > error_count_diff; current_index++) {
add_next_index_null(return_value);
}
}
}
/* }}} */

15
ext/pdo/pdo_stmt.c
View file

@ -1784,6 +1784,10 @@ static PHP_METHOD(PDOStatement, errorCode)
Fetch extended error information associated with the last operation on the statement handle */
static PHP_METHOD(PDOStatement, errorInfo)
{
int error_count;
int error_count_diff = 0;
int error_expected_count = 3;
PHP_STMT_GET_OBJ;
if (zend_parse_parameters_none() == FAILURE) {
@ -1796,6 +1800,17 @@ static PHP_METHOD(PDOStatement, errorInfo)
if (stmt->dbh->methods->fetch_err) {
stmt->dbh->methods->fetch_err(stmt->dbh, stmt, return_value TSRMLS_CC);
}
error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
if (error_expected_count > error_count) {
error_count_diff = error_expected_count - error_count;
int current_index;
for (current_index = 0; current_index < error_count_diff; current_index++) {
add_next_index_null(return_value);
}
}
}
/* }}} */