Skip to content

FIX: Handle empty data + tests #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Sep 6, 2025
+454 −15
Merged

FIX: Handle empty data + tests #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8e3a39e
FIX: Handle empty data
bewithgaurav Aug 29, 2025
08f9a4c
undo some stuff
bewithgaurav Aug 29, 2025
38381fe
0 length fix and tests
bewithgaurav Aug 29, 2025
229c957
restore condition and cleanup
bewithgaurav Aug 29, 2025
7dc1135
fixed assert
bewithgaurav Aug 29, 2025
2255e50
Merge branch 'main' into bewithgaurav/fix_blank_columns
bewithgaurav Aug 29, 2025
40a008b
Merge branch 'main' of https://github.com/microsoft/mssql-python into…
bewithgaurav Sep 1, 2025
42785d9
Merge branch 'main' into bewithgaurav/fix_blank_columns
bewithgaurav Sep 3, 2025
ecbea82
Merge branch 'main' of https://github.com/microsoft/mssql-python into…
bewithgaurav Sep 5, 2025
9ce15d0
added tests and refactored the flow
bewithgaurav Sep 5, 2025
5274291
Merge branch 'bewithgaurav/fix_blank_columns' of https://github.com/m…
bewithgaurav Sep 5, 2025
b5d7df8
IP instead of localhost inside build-whl-pipeline as well
bewithgaurav Sep 5, 2025
2c2e2b3
restored localhost commit, unrelated branch
bewithgaurav Sep 5, 2025
c767762
Merge branch 'main' into bewithgaurav/fix_blank_columns
bewithgaurav Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 53 additions & 15 deletions mssql_python/pybind/ddbc_bindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,11 +1778,19 @@ SQLRETURN SQLGetData_wrap(SqlHandlePtr StatementHandle, SQLUSMALLINT colCount, p
}
} else if (dataLen == SQL_NULL_DATA) {
row.append(py::none());
} else {
assert(dataLen == SQL_NO_TOTAL);
} else if (dataLen == 0) {
// Handle zero-length (non-NULL) data
row.append(std::string(""));
} else if (dataLen == SQL_NO_TOTAL) {
// This means the length of the data couldn't be determined
LOG("SQLGetData couldn't determine the length of the data. "
"Returning NULL value instead. Column ID - {}", i);
row.append(py::none());
"Returning NULL value instead. Column ID - {}, Data Type - {}", i, dataType);
} else if (dataLen < 0) {
// This is unexpected
LOG("SQLGetData returned an unexpected negative data length. "
"Raising exception. Column ID - {}, Data Type - {}, Data Length - {}",
i, dataType, dataLen);
ThrowStdException("SQLGetData returned an unexpected negative data length");
}
} else {
LOG("Error retrieving data for column - {}, data type - {}, SQLGetData return "
Expand Down Expand Up @@ -1834,11 +1842,15 @@ SQLRETURN SQLGetData_wrap(SqlHandlePtr StatementHandle, SQLUSMALLINT colCount, p
}
} else if (dataLen == SQL_NULL_DATA) {
row.append(py::none());
} else {
assert(dataLen == SQL_NO_TOTAL);
LOG("SQLGetData couldn't determine the length of the data. "
"Returning NULL value instead. Column ID - {}", i);
row.append(py::none());
} else if (dataLen == 0) {
// Handle zero-length (non-NULL) data
row.append(py::str(""));
} else if (dataLen < 0) {
// This is unexpected
LOG("SQLGetData returned an unexpected negative data length. "
"Raising exception. Column ID - {}, Data Type - {}, Data Length - {}",
i, dataType, dataLen);
ThrowStdException("SQLGetData returned an unexpected negative data length");
}
} else {
LOG("Error retrieving data for column - {}, data type - {}, SQLGetData return "
Expand Down Expand Up @@ -2030,11 +2042,15 @@ SQLRETURN SQLGetData_wrap(SqlHandlePtr StatementHandle, SQLUSMALLINT colCount, p
}
} else if (dataLen == SQL_NULL_DATA) {
row.append(py::none());
} else {
assert(dataLen == SQL_NO_TOTAL);
LOG("SQLGetData couldn't determine the length of the data. "
"Returning NULL value instead. Column ID - {}", i);
row.append(py::none());
} else if (dataLen == 0) {
// Empty bytes
row.append(py::bytes(""));
} else if (dataLen < 0) {
// This is unexpected
LOG("SQLGetData returned an unexpected negative data length. "
"Raising exception. Column ID - {}, Data Type - {}, Data Length - {}",
i, dataType, dataLen);
ThrowStdException("SQLGetData returned an unexpected negative data length");
}
} else {
LOG("Error retrieving data for column - {}, data type - {}, SQLGetData return "
Expand Down Expand Up @@ -2317,8 +2333,30 @@ SQLRETURN FetchBatchData(SQLHSTMT hStmt, ColumnBuffers& buffers, py::list& colum
"Column ID - {}", col);
row.append(py::none());
continue;
} else if (dataLen == SQL_NULL_DATA) {
LOG("Column data is NULL. Appending None to the result row. Column ID - {}", col);
row.append(py::none());
continue;
} else if (dataLen == 0) {
// Handle zero-length (non-NULL) data
if (dataType == SQL_CHAR || dataType == SQL_VARCHAR || dataType == SQL_LONGVARCHAR) {
row.append(std::string(""));
} else if (dataType == SQL_WCHAR || dataType == SQL_WVARCHAR || dataType == SQL_WLONGVARCHAR) {
row.append(std::wstring(L""));
} else if (dataType == SQL_BINARY || dataType == SQL_VARBINARY || dataType == SQL_LONGVARBINARY) {
row.append(py::bytes(""));
} else {
// For other datatypes, 0 length is unexpected. Log & append None
LOG("Column data length is 0 for non-string/binary datatype. Appending None to the result row. Column ID - {}", col);
row.append(py::none());
}
continue;
} else if (dataLen < 0) {
// Negative value is unexpected, log column index, SQL type & raise exception
LOG("Unexpected negative data length. Column ID - {}, SQL Type - {}, Data Length - {}", col, dataType, dataLen);
ThrowStdException("Unexpected negative data length, check logs for details");
}
assert(dataLen > 0 && "Must be > 0 since SQL_NULL_DATA & SQL_NO_DATA is already handled");
assert(dataLen > 0 && "Data length must be > 0");

switch (dataType) {
case SQL_CHAR:
Expand Down
Loading
Loading