fixed conflicts
This commit is contained in:
commit
1045ea40a9
|
@ -1018,15 +1018,6 @@ PHP_FUNCTION( sqlsrv_send_stream_data )
|
|||
|
||||
try {
|
||||
|
||||
// Make sure that the result set is not null, i.e. SQLNumResultCols() does not
|
||||
// return 0. Normally this error is handled in core_sqlsrv_fetch, but if the
|
||||
// user calls sqlsrv_next_result() before fetch() the error is never shown so
|
||||
// we handle it here.
|
||||
SQLSMALLINT has_fields = core::SQLNumResultCols( stmt TSRMLS_CC );
|
||||
CHECK_CUSTOM_ERROR( has_fields == 0, stmt, SQLSRV_ERROR_NO_FIELDS ) {
|
||||
throw core::CoreException();
|
||||
}
|
||||
|
||||
// if everything was sent at execute time, just return that there is nothing more to send.
|
||||
if( stmt->send_streams_at_exec ) {
|
||||
RETURN_NULL();
|
||||
|
|
Loading…
Reference in a new issue