зеркало из https://github.com/microsoft/msphpsql.git
Fix error throw for multiple result sets (#1485)
This commit is contained in:
Родитель
9932512626
Коммит
24d72cba24
|
@ -975,7 +975,7 @@ zend_long pdo_sqlsrv_dbh_do(_Inout_ pdo_dbh_t *dbh, _In_ const zend_string *sql)
|
|||
// since the user can give us a compound statement, we return the row count for the last set, and since the row count
|
||||
// isn't guaranteed to be valid until all the results have been fetched, we fetch them all first.
|
||||
|
||||
if ( execReturn != SQL_NO_DATA && core_sqlsrv_has_any_result( driver_stmt )) {
|
||||
if ( core_sqlsrv_has_any_result( driver_stmt )) {
|
||||
|
||||
SQLRETURN r = SQL_SUCCESS;
|
||||
|
||||
|
@ -987,7 +987,6 @@ zend_long pdo_sqlsrv_dbh_do(_Inout_ pdo_dbh_t *dbh, _In_ const zend_string *sql)
|
|||
|
||||
} while ( r != SQL_NO_DATA );
|
||||
}
|
||||
|
||||
// returning -1 forces PDO to return false, which signals an error occurred. SQLRowCount returns -1 for a number of cases
|
||||
// naturally, so we override that here with no rows returned.
|
||||
if( rows == -1 ) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче