cleanup

gargsaumya · gargsaumya · commit 4ea32c7ad8c4 · 2025-07-15T14:35:30.000+05:30
diff --git a/mssql_python/cursor.py b/mssql_python/cursor.py
@@ -619,51 +619,11 @@ def execute(
 
         # Initialize description after execution
         self._initialize_description()
-    
-
-    # def executemany(self, operation: str, seq_of_parameters: list) -> None:
-    #     self._check_closed()
-    #     self._reset_cursor()
-
-    #     if not seq_of_parameters:
-    #         return
-
-    #     # Transpose to column-major format
-    #     columns = list(zip(*seq_of_parameters))  # Each column: tuple of values
-    #     sample_params = seq_of_parameters[0]
-    #     param_info = ddbc_bindings.ParamInfo
-
-    #     parameters_type = []
-    #     for i, sample_val in enumerate(sample_params):
-    #         paraminfo = self._create_parameter_types_list(sample_val, param_info, sample_params, i)
-
-    #         # Fix: Adjust string column sizes based on actual max length across all rows
-    #         if isinstance(sample_val, str):
-    #             max_len = max(
-    #                 (len(v) for v in columns[i] if isinstance(v, str)),
-    #                 default=1  # fallback if all values are None
-    #             )
-    #             paraminfo.columnSize = max_len
-
-    #         parameters_type.append(paraminfo)
-
-    #     # Now execute with adjusted parameter types
-    #     ret = ddbc_bindings.SQLExecuteMany(
-    #         self.hstmt, operation, columns, parameters_type, len(seq_of_parameters)
-    #     )
-    #     check_error(ddbc_sql_const.SQL_HANDLE_STMT.value, self.hstmt, ret)
-
-    #     self.rowcount = ddbc_bindings.DDBCSQLRowCount(self.hstmt)
-    #     self._initialize_description()
 
     def _transpose_rowwise_to_columnwise(self, seq_of_parameters: list) -> list:
         """
         Convert list of rows (row-wise) into list of columns (column-wise),
-        for array binding via ODBC.
-        
-        Example:
-            Input: [(1, "a"), (2, "b")]
-            Output: [[1, 2], ["a", "b"]]
+        for array binding.
         """
         if not seq_of_parameters:
             return []
@@ -688,39 +648,23 @@ def executemany(self, operation: str, seq_of_parameters: list) -> None:
         if not seq_of_parameters:
             self.rowcount = 0
             return
-
-        # # Infer types from the first row
-        # first_row = list(seq_of_parameters[0])
-        # param_info = ddbc_bindings.ParamInfo
-        # parameters_type = [
-        #     self._create_parameter_types_list(param, param_info, first_row, i)
-        #     for i, param in enumerate(first_row)
-        # ]
         param_info = ddbc_bindings.ParamInfo
         param_count = len(seq_of_parameters[0])
         parameters_type = []
 
         for col_index in range(param_count):
-            # Use the longest string (or most precise value) in that column for inference
             column = [row[col_index] for row in seq_of_parameters]
             sample_value = column[0]
-
-            # For strings, pick the value with max len
             if isinstance(sample_value, str):
                 sample_value = max(column, key=lambda s: len(str(s)) if s is not None else 0)
-
-            # For decimals, use the one with highest precision
             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])  # to pass for `_get_numeric_data()` mutation
+            dummy_row = list(seq_of_parameters[0])
             parameters_type.append(self._create_parameter_types_list(param, param_info, dummy_row, col_index))
 
-
-        # Transpose to column-wise format for array binding
         columnwise_params = self._transpose_rowwise_to_columnwise(seq_of_parameters)
-
         # Execute batched statement
         ret = ddbc_bindings.SQLExecuteMany(
             self.hstmt,
@@ -729,9 +673,7 @@ def executemany(self, operation: str, seq_of_parameters: list) -> None:
             parameters_type,
             len(seq_of_parameters)
         )
-        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()
 
diff --git a/mssql_python/pybind/ddbc_bindings.cpp b/mssql_python/pybind/ddbc_bindings.cpp
@@ -1012,7 +1012,7 @@ SQLRETURN BindParameterArray(SQLHANDLE hStmt,
                                           ", len: " + std::to_string(wstr.length()) +
                                           " > columnSize: " + std::to_string(info.columnSize));
                     }
-                    std::memcpy(wcharArray + i * (info.columnSize + 1), wstr.c_str(), (wstr.length() + 1) * sizeof(SQLWCHAR));
+                    std::wcsncpy(wcharArray + i * (info.columnSize + 1), wstr.c_str(), info.columnSize + 1);
                     strLenOrIndArray[i] = SQL_NTS;
                 }
                 dataPtr = wcharArray;

Original file line number	Diff line number	Diff line change
`@@ -1012,7 +1012,7 @@ SQLRETURN BindParameterArray(SQLHANDLE hStmt,`
`1012`	`1012`	`", len: " + std::to_string(wstr.length()) +`
`1013`	`1013`	`" > columnSize: " + std::to_string(info.columnSize));`
`1014`	`1014`	`}`
`1015`		`- std::memcpy(wcharArray + i * (info.columnSize + 1), wstr.c_str(), (wstr.length() + 1) * sizeof(SQLWCHAR));`
	`1015`	`+ std::wcsncpy(wcharArray + i * (info.columnSize + 1), wstr.c_str(), info.columnSize + 1);`
`1016`	`1016`	`strLenOrIndArray[i] = SQL_NTS;`
`1017`	`1017`	`}`
`1018`	`1018`	`dataPtr = wcharArray;`