cleaning up

Author: gargsaumya

mssql_python/cursor.py

@@ -18,12 +18,9 @@
 from mssql_python.logging_config import get_logger, ENABLE_LOGGING
 from mssql_python import ddbc_bindings
 from .row import Row
-from typing import Sequence, Any
-
 
 logger = get_logger()
 
-
 class Cursor:
     """
     Represents a database cursor, which is used to manage the context of a fetch operation.
@@ -541,7 +538,7 @@ def _map_data_type(self, sql_type):
             # Add more mappings as needed
         }
         return sql_to_python_type.get(sql_type, str)
-    
+
     def execute(
         self,
         operation: str,
@@ -656,13 +653,10 @@ def executemany(self, operation: str, seq_of_parameters: list) -> None:
         for col_index in range(param_count):
             column = [row[col_index] for row in seq_of_parameters]
             sample_value = column[0]
-
             if isinstance(sample_value, str):
                 sample_value = max(column, key=lambda s: len(str(s)) if s is not None else 0)
-
             elif isinstance(sample_value, decimal.Decimal):
                 sample_value = max(column, key=lambda d: len(d.as_tuple().digits) if d is not None else 0)
-
             param = sample_value
             dummy_row = list(seq_of_parameters[0])
             parameters_type.append(self._create_parameter_types_list(param, param_info, dummy_row, col_index))
@@ -679,7 +673,7 @@ def executemany(self, operation: str, seq_of_parameters: list) -> None:
         )
         check_error(ddbc_sql_const.SQL_HANDLE_STMT.value, self.hstmt, ret)
 
-        self.rowcount = len(seq_of_parameters)
+        self.rowcount = ddbc_bindings.DDBCSQLRowCount(self.hstmt)
         self.last_executed_stmt = operation
         self._initialize_description()
 

mssql_python/pybind/ddbc_bindings.cpp

@@ -948,15 +948,12 @@ SQLRETURN BindParameterArray(SQLHANDLE hStmt,
                              size_t paramSetSize,
                              std::vector<std::shared_ptr<void>>& paramBuffers) {
     LOG("Starting column-wise parameter array binding. paramSetSize: {}, paramCount: {}", paramSetSize, columnwise_params.size());
-
     for (int paramIndex = 0; paramIndex < columnwise_params.size(); ++paramIndex) {
         const py::list& columnValues = columnwise_params[paramIndex].cast<py::list>();
         const ParamInfo& info = paramInfos[paramIndex];
-
         if (columnValues.size() != paramSetSize) {
             ThrowStdException("Column " + std::to_string(paramIndex) + " has mismatched size.");
         }
-
         void* dataPtr = nullptr;
         SQLLEN* strLenOrIndArray = nullptr;
         SQLLEN bufferLength = 0;
@@ -1003,7 +1000,6 @@ SQLRETURN BindParameterArray(SQLHANDLE hStmt,
                         std::memset(wcharArray + i * (info.columnSize + 1), 0, (info.columnSize + 1) * sizeof(SQLWCHAR));
                         continue;
                     }
-
                     std::wstring wstr = columnValues[i].cast<std::wstring>();
                     if (wstr.length() > info.columnSize) {
                         std::string offending = WideToUTF8(wstr);
@@ -1023,15 +1019,19 @@ SQLRETURN BindParameterArray(SQLHANDLE hStmt,
             case SQL_C_UTINYINT: {
                 unsigned char* dataArray = AllocateParamBufferArray<unsigned char>(paramBuffers, paramSetSize);
                 for (size_t i = 0; i < paramSetSize; ++i) {
-                    const py::handle& value = columnValues[i];
-                    if (!py::isinstance<py::int_>(value)) {
-                        ThrowStdException(MakeParamMismatchErrorStr(info.paramCType, paramIndex));
-                    }
-                    int intVal = value.cast<int>();
-                    if (intVal < 0 || intVal > 255) {
-                        ThrowStdException("UTINYINT value out of range at rowIndex " + std::to_string(i));
+                    if (columnValues[i].is_none()) {
+                        if (!strLenOrIndArray)
+                            strLenOrIndArray = AllocateParamBufferArray<SQLLEN>(paramBuffers, paramSetSize);
+                        dataArray[i] = 0;
+                        strLenOrIndArray[i] = SQL_NULL_DATA;
+                    } else {
+                        int intVal = columnValues[i].cast<int>();
+                        if (intVal < 0 || intVal > 255) {
+                            ThrowStdException("UTINYINT value out of range at rowIndex " + std::to_string(i));
+                        }
+                        dataArray[i] = static_cast<unsigned char>(intVal);
+                        if (strLenOrIndArray) strLenOrIndArray[i] = 0;
                     }
-                    dataArray[i] = static_cast<unsigned char>(intVal);
                 }
                 dataPtr = dataArray;
                 bufferLength = sizeof(unsigned char);
@@ -1040,22 +1040,25 @@ SQLRETURN BindParameterArray(SQLHANDLE hStmt,
             case SQL_C_SHORT: {
                 short* dataArray = AllocateParamBufferArray<short>(paramBuffers, paramSetSize);
                 for (size_t i = 0; i < paramSetSize; ++i) {
-                    const py::handle& value = columnValues[i];
-                    if (!py::isinstance<py::int_>(value)) {
-                        ThrowStdException(MakeParamMismatchErrorStr(info.paramCType, paramIndex));
-                    }
-                    int intVal = value.cast<int>();
-                    if (intVal < std::numeric_limits<short>::min() ||
-                        intVal > std::numeric_limits<short>::max()) {
-                        ThrowStdException("SHORT value out of range at rowIndex " + std::to_string(i));
+                    if (columnValues[i].is_none()) {
+                        if (!strLenOrIndArray)
+                            strLenOrIndArray = AllocateParamBufferArray<SQLLEN>(paramBuffers, paramSetSize);
+                        dataArray[i] = 0;
+                        strLenOrIndArray[i] = SQL_NULL_DATA;
+                    } else {
+                        int intVal = columnValues[i].cast<int>();
+                        if (intVal < std::numeric_limits<short>::min() ||
+                            intVal > std::numeric_limits<short>::max()) {
+                            ThrowStdException("SHORT value out of range at rowIndex " + std::to_string(i));
+                        }
+                        dataArray[i] = static_cast<short>(intVal);
+                        if (strLenOrIndArray) strLenOrIndArray[i] = 0;
                     }
-                    dataArray[i] = static_cast<short>(intVal);
                 }
                 dataPtr = dataArray;
                 bufferLength = sizeof(short);
                 break;
             }
-
             default: {
                 ThrowStdException("BindParameterArray: Unsupported C type: " + std::to_string(info.paramCType));
             }