Fix for redundant calls to SQLNumResultCols and SQLRowCount #972
+79
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## dev #972 +/- ##
=========================================
- Coverage 81.38% 81.3% -0.08%
=========================================
Files 25 25
Lines 7758 7790 +32
=========================================
+ Hits 6314 6334 +20
- Misses 1444 1456 +12
Continue to review full report at Codecov.
|
yitam
reviewed
Apr 11, 2019
yitam
reviewed
Apr 11, 2019
yitam
reviewed
Apr 11, 2019
yitam
reviewed
Apr 11, 2019
source/sqlsrv/util.cpp
Outdated
| @@ -196,7 +196,7 @@ ss_error SS_ERRORS[] = { | |||
|
|
|||
| { | |||
| SQLSRV_ERROR_NO_FIELDS, | |||
| { IMSSP, (SQLCHAR*)"The active result for the query contains no fields.", -28, false } | |||
| { IMSSP, (SQLCHAR*)"The active result for the query contains no fields, so no result set was created.", -28, false } | |||
| }, | |||
|
|
|||
There was a problem hiding this comment.
I suggest not to change the existing error message
yitam
reviewed
Apr 11, 2019
| if (stmt->columns_rows_obtained == false) { | ||
| num_cols = core::SQLNumResultCols(stmt TSRMLS_CC); | ||
| } else { | ||
| num_cols = stmt->column_count; |
There was a problem hiding this comment.
Again, see my earlier comment about setting stmt->column_count after calling SQLNumResultCols
yitam
reviewed
Apr 15, 2019
| @@ -828,7 +826,7 @@ bool core_sqlsrv_fetch( _Inout_ sqlsrv_stmt* stmt, _In_ SQLSMALLINT fetch_orient | |||
| // First time only | |||
| if ( !stmt->fetch_called ) { | |||
| SQLSMALLINT has_fields; | |||
| if (stmt->columns_rows_obtained) { | |||
| if (stmt->column_count != ACTIVE_NUM_COLS_INVALID) { | |||
| has_fields = stmt->column_count; | |||
| } else { | |||
| has_fields = core::SQLNumResultCols( stmt TSRMLS_CC ); | |||
There was a problem hiding this comment.
After calling SQLNumResultCols, do you set stmt->column_count? If not, when?
| if (stmt->columns_rows_obtained == false) { | ||
| num_cols = core::SQLNumResultCols(stmt TSRMLS_CC); | ||
| } else { | ||
| num_cols = stmt->column_count; |
There was a problem hiding this comment.
Again, see my earlier comment about setting stmt->column_count after calling SQLNumResultCols
yitam
approved these changes
Apr 15, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://docs.microsoft.com/sql/odbc/reference/develop-app/was-a-result-set-created