cleanup

Author: gargsaumya

main.py

@@ -5,65 +5,17 @@
 
 setup_logging('stdout')
 
-# conn_str = os.getenv("DB_CONNECTION_STRING")
-# conn = connect(conn_str)
+conn_str = os.getenv("DB_CONNECTION_STRING")
+conn = connect(conn_str)
 
-# # conn.autocommit = True
+# conn.autocommit = True
 
-# cursor = conn.cursor()
-# cursor.execute("SELECT database_id, name from sys.databases;")
-# rows = cursor.fetchall()
+cursor = conn.cursor()
+cursor.execute("SELECT database_id, name from sys.databases;")
+rows = cursor.fetchall()
 
-# for row in rows:
-#     print(f"Database ID: {row[0]}, Name: {row[1]}")
+for row in rows:
+    print(f"Database ID: {row[0]}, Name: {row[1]}")
 
-# cursor.close()
-# conn.close()
-
-conn_str = "Server=Saumya;DATABASE=master;UID=sa;PWD=HappyPass1234;Trust_Connection=yes;TrustServerCertificate=yes;"
-db_connection = connect(conn_str)
-db_connection.autocommit = True
-values = ["Ω" * 4100, "漢" * 5000]
-cursor = db_connection.cursor()
-cursor.execute("CREATE TABLE #pytest_nvarcharmax (col NVARCHAR(MAX))")
-db_connection.commit()
-
-# --- use executemany for inserts ---
-cursor.executemany(
-    "INSERT INTO #pytest_nvarcharmax VALUES (?)",
-    [(v,) for v in values],
-)
-db_connection.commit()
-
-# --- fetchall ---
-cursor.execute("SELECT col FROM #pytest_nvarcharmax ORDER BY LEN(col)")
-rows = [r[0] for r in cursor.fetchall()]
-assert rows == sorted(values, key=len)
-
-# --- fetchone ---
-cursor.execute("SELECT col FROM #pytest_nvarcharmax ORDER BY LEN(col)")
-r1 = cursor.fetchone()[0]
-r2 = cursor.fetchone()[0]
-assert {r1, r2} == set(values)
-assert cursor.fetchone() is None
-
-# --- fetchmany ---
-cursor.execute("SELECT col FROM #pytest_nvarcharmax ORDER BY LEN(col)")
-
-batch = cursor.fetchmany(1)
-assert set(r[0] for r in batch).issubset(set(values))
-
-remaining = []
-while True:
-    rows = cursor.fetchmany(1)
-    if not rows:
-        break
-    remaining.extend(rows)
-
-all_fetched = [r[0] for r in batch + remaining]
-assert set(all_fetched) == set(values)
-
-
-# --- cleanup ---
-cursor.execute("DROP TABLE #pytest_nvarcharmax")
-db_connection.commit()
+cursor.close()
+conn.close()

mssql_python/cursor.py

@@ -998,19 +998,19 @@ def execute(
             self.is_stmt_prepared = [False]
 
         log('debug', "Executing query: %s", operation)
-        # for i, param in enumerate(parameters):
-            # log('debug',
-            #     """Parameter number: %s, Parameter: %s,
-            #     Param Python Type: %s, ParamInfo: %s, %s, %s, %s, %s""",
-            #     i + 1,
-            #     param,
-            #     str(type(param)),
-            #         parameters_type[i].paramSQLType,
-            #         parameters_type[i].paramCType,
-            #         parameters_type[i].columnSize,
-            #         parameters_type[i].decimalDigits,
-            #         parameters_type[i].inputOutputType,
-            #     )
+        for i, param in enumerate(parameters):
+            log('debug',
+                """Parameter number: %s, Parameter: %s,
+                Param Python Type: %s, ParamInfo: %s, %s, %s, %s, %s""",
+                i + 1,
+                param,
+                str(type(param)),
+                    parameters_type[i].paramSQLType,
+                    parameters_type[i].paramCType,
+                    parameters_type[i].columnSize,
+                    parameters_type[i].decimalDigits,
+                    parameters_type[i].inputOutputType,
+                )
 
         ret = ddbc_bindings.DDBCSQLExecute(
             self.hstmt,
@@ -1701,7 +1701,6 @@ def executemany(self, operation: str, seq_of_parameters: list) -> None:
                 if paraminfo.isDAE:
                     any_dae = True
 
-        # If any DAE parameter exists, fall back to row-by-row execution
         if any_dae:
             log('debug', "DAE parameters detected. Falling back to row-by-row execution with streaming.")
             for row in seq_of_parameters:
@@ -1759,7 +1758,6 @@ def executemany(self, operation: str, seq_of_parameters: list) -> None:
             # Reset input sizes after execution
             self._reset_inputsizes()
 
-
     def fetchone(self) -> Union[None, Row]:
         """
         Fetch the next row of a query result set.

mssql_python/pybind/CMakeLists.txt

@@ -272,7 +272,7 @@ target_compile_definitions(ddbc_bindings PRIVATE
 
 # Add warning level flags for MSVC
 if(MSVC)
-    target_compile_options(ddbc_bindings PRIVATE /W4 )
+    target_compile_options(ddbc_bindings PRIVATE /W4 /WX)
 endif()
 
 # Add macOS-specific string conversion fix

mssql_python/pybind/ddbc_bindings.cpp

@@ -1997,8 +1997,7 @@ SQLRETURN SQLExecuteMany_wrap(const SqlHandlePtr statementHandle,
                               const std::wstring& query,
                               const py::list& columnwise_params,
                               const std::vector<ParamInfo>& paramInfos,
-                              size_t paramSetSize) 
-{
+                              size_t paramSetSize) {
     SQLHANDLE hStmt = statementHandle->get();
     SQLWCHAR* queryPtr;
 
@@ -2008,22 +2007,17 @@ SQLRETURN SQLExecuteMany_wrap(const SqlHandlePtr statementHandle,
 #else
     queryPtr = const_cast<SQLWCHAR*>(query.c_str());
 #endif
-
     RETCODE rc = SQLPrepare_ptr(hStmt, queryPtr, SQL_NTS);
     if (!SQL_SUCCEEDED(rc)) return rc;
 
-    // Check if any param is DAE/streaming
     bool hasDAE = false;
     for (const auto& p : paramInfos) {
         if (p.isDAE) {
             hasDAE = true;
             break;
         }
     }
-
     if (!hasDAE) {
-        LOG("No DAE parameters detected. Proceeding with fast array execution.");
-        // Fast path: no streaming, bind entire array
         std::vector<std::shared_ptr<void>> paramBuffers;
         rc = BindParameterArray(hStmt, columnwise_params, paramInfos, paramSetSize, paramBuffers);
         if (!SQL_SUCCEEDED(rc)) return rc;
@@ -2034,8 +2028,6 @@ SQLRETURN SQLExecuteMany_wrap(const SqlHandlePtr statementHandle,
         rc = SQLExecute_ptr(hStmt);
         return rc;
     } else {
-        LOG("DAE parameters detected. Falling back to row-by-row execution with streaming.");
-        // Fallback: row-by-row execution with streaming
         size_t rowCount = columnwise_params.size();
         for (size_t rowIndex = 0; rowIndex < rowCount; ++rowIndex) {
             py::list rowParams = columnwise_params[rowIndex];
@@ -2045,8 +2037,6 @@ SQLRETURN SQLExecuteMany_wrap(const SqlHandlePtr statementHandle,
             if (!SQL_SUCCEEDED(rc)) return rc;
 
             rc = SQLExecute_ptr(hStmt);
-
-            // Handle DAE streaming
             while (rc == SQL_NEED_DATA) {
                 SQLPOINTER token;
                 rc = SQLParamData_ptr(hStmt, &token);
@@ -2055,7 +2045,6 @@ SQLRETURN SQLExecuteMany_wrap(const SqlHandlePtr statementHandle,
                 py::object* py_obj_ptr = reinterpret_cast<py::object*>(token);
                 if (!py_obj_ptr) return SQL_ERROR;
 
-                // Support string/binary streaming
                 if (py::isinstance<py::str>(*py_obj_ptr)) {
                     std::string data = py_obj_ptr->cast<std::string>();
                     SQLLEN data_len = static_cast<SQLLEN>(data.size());