Revert next result changes, improve tests

microsoft · Nov 16, 2017 · 633024c · 633024c
1 parent 07ac237
commit 633024c
Show file tree

Hide file tree

Showing 4 changed files with 703 additions and 277 deletions.
diff --git a/source/pdo_sqlsrv/pdo_stmt.cpp b/source/pdo_sqlsrv/pdo_stmt.cpp
@@ -1067,33 +1067,6 @@ int pdo_sqlsrv_stmt_next_rowset( _Inout_ pdo_stmt_t *stmt TSRMLS_DC )
 
         SQLSRV_ASSERT( driver_stmt != NULL, "pdo_sqlsrv_stmt_next_rowset: driver_data object was null" );
 
-        // Return the correct error in case the user calls nextRowset() on a null result set. 
-        // Null means that SQLNumResultCols() returns 0 and SQLRowCount does not return > 0. But first 
-        // check that the statement has been executed and that we are not past the end of a non-null 
-        // result set to make sure the user gets the correct error message. These checks are also 
-        // done in core_sqlsrv_next_result(), but we cannot check for null results there because that
-        // function can be called without calling this one, and SQLSRV_ERROR_NO_FIELDS can then
-        // be triggered incorrectly. 
-        CHECK_CUSTOM_ERROR( !driver_stmt->executed, driver_stmt, SQLSRV_ERROR_STATEMENT_NOT_EXECUTED ) {
-            throw core::CoreException();
-        }
-
-        CHECK_CUSTOM_ERROR( driver_stmt->past_next_result_end, driver_stmt, SQLSRV_ERROR_NEXT_RESULT_PAST_END ) {
-            throw core::CoreException();
-        }
-
-        // Now make sure the result set is not null. 
-        bool has_result = core_sqlsrv_has_any_result( driver_stmt );
-
-        // Note that if fetch_called is false but has_result is true (i.e. the user is calling 
-        // nextRowset() on a non-null result set before calling fetch()), it is handled 
-        // in core_sqlsrv_next_result() below.
-        if( !driver_stmt->fetch_called ) {
-            CHECK_CUSTOM_ERROR( !has_result, driver_stmt, SQLSRV_ERROR_NO_FIELDS ) {
-                throw core::CoreException();
-            }
-        }
-
         core_sqlsrv_next_result( static_cast<sqlsrv_stmt*>( stmt->driver_data ) TSRMLS_CC );
 
         // clear the current meta data since the new result will generate new meta data

diff --git a/source/sqlsrv/stmt.cpp b/source/sqlsrv/stmt.cpp
@@ -560,32 +560,6 @@ PHP_FUNCTION( sqlsrv_next_result )
     PROCESS_PARAMS( stmt, "r", _FN_, 0 );
 
     try {
-
-        // Return the correct error in case the user calls sqlsrv_next_result() on a null result set. 
-        // Null means that SQLNumResultCols() returns 0 and SQLRowCount does not return > 0. But first 
-        // check that the statement has been executed and that we are not past the end of a non-null 
-        // result set to make sure the user gets the correct error message. These checks are also 
-        // done in core_sqlsrv_next_result(), but we cannot check for null results there because that
-        // function can be called without calling this one, and SQLSRV_ERROR_NO_FIELDS can then
-        // be triggered incorrectly. 
-        CHECK_CUSTOM_ERROR( !stmt->executed, stmt, SQLSRV_ERROR_STATEMENT_NOT_EXECUTED ) {
-            throw core::CoreException();
-        }
-
-        CHECK_CUSTOM_ERROR( stmt->past_next_result_end, stmt, SQLSRV_ERROR_NEXT_RESULT_PAST_END ) {
-            throw core::CoreException();
-        }
-
-        bool has_result = core_sqlsrv_has_any_result( stmt );
-
-        // Note that if fetch_called is false but has_result is true (i.e. the user is calling 
-        // sqlsrv_next_result() on a non-null result set before calling fetch()), it is handled 
-        // in core_sqlsrv_next_result() below.
-        if( !stmt->fetch_called ) {
-            CHECK_CUSTOM_ERROR( !has_result, stmt, SQLSRV_ERROR_NO_FIELDS ) {
-                throw core::CoreException();
-            }
-        }
 
         core_sqlsrv_next_result( stmt TSRMLS_CC, true );