Skip to content

Commit

Permalink
Fix error throw for multiple result sets (#1485)
Browse files Browse the repository at this point in the history
  • Loading branch information
absci authored Dec 1, 2023
1 parent 9932512 commit 24d72cb
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions source/pdo_sqlsrv/pdo_dbh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 ) {
Expand Down

0 comments on commit 24d72cb

Please sign in to comment.