Resolving conflicts

Author: jahnvi480

.coveragerc

@@ -1,6 +1,8 @@
 [run]
 omit =
-    mssql_python/testing_ddbc_bindings.py
+    main.py
+    setup.py
+    bcp_options.py
     tests/*
 
 [report]

.github/workflows/pr-code-coverage.yml

@@ -57,9 +57,9 @@ jobs:
               // Extract the summary content
               const summaryContent = summaryMatch[1];
 
-              // Remove all HTML comments including the template placeholder
+              // Remove all HTML comments including unclosed ones (template placeholders)
               const contentWithoutComments = 
-                summaryContent.replace(/<!--[\s\S]*?-->/g, '');
+                summaryContent.replace(/<!--[\s\S]*?(?:-->|$)/g, '');
 
               // Remove whitespace and check if there's actual text content
               const trimmedContent = contentWithoutComments.trim();
@@ -94,24 +94,35 @@ jobs:
               labelToAdd = 'pr-size: large';
             }
 
-            // Remove existing size labels if any
+            // Get existing labels
             const existingLabels = pr.labels.map(l => l.name);
             const sizeLabels = ['pr-size: small', 'pr-size: medium', 'pr-size: large'];
-            for (const label of existingLabels) {
-              if (sizeLabels.includes(label)) {
+            
+            // Find current size label (if any)
+            const currentSizeLabel = existingLabels.find(label => sizeLabels.includes(label));
+            
+            // Only make changes if the label needs to be updated
+            if (currentSizeLabel !== labelToAdd) {
+              console.log(`Current size label: ${currentSizeLabel || 'none'}`);
+              console.log(`Required size label: ${labelToAdd} (Total changes: ${totalChanges})`);
+              
+              // Remove existing size label if different from required
+              if (currentSizeLabel) {
+                console.log(`Removing outdated label: ${currentSizeLabel}`);
                 await github.rest.issues.removeLabel({
                   ...context.repo,
                   issue_number: pr.number,
-                  name: label,
+                  name: currentSizeLabel,
                 });
               }
-            }
 
-            // Add new size label
-            await github.rest.issues.addLabels({
-              ...context.repo,
-              issue_number: pr.number,
-              labels: [labelToAdd],
-            });
-
-            console.log(`Added label: ${labelToAdd} (Total changes: ${totalChanges})`);
+              // Add new size label
+              console.log(`Adding new label: ${labelToAdd}`);
+              await github.rest.issues.addLabels({
+                ...context.repo,
+                issue_number: pr.number,
+                labels: [labelToAdd],
+              });
+            } else {
+              console.log(`Label already correct: ${labelToAdd} (Total changes: ${totalChanges}) - no changes needed`);
+            }

.github/workflows/pr-format-check.yml

@@ -1,6 +1,3 @@
-# Ignore all files in the pybind/build directory
-mssql_python/pybind/build/
-
 # Ignore pycache files and folders
 __pycache__/
 **/__pycache__/
@@ -23,6 +20,7 @@ test-*.xml
 
 # Ignore the build & mssql_python.egg-info directories
 build/
+**/build/
 mssql_python.egg-info/
 
 # Python bytecode
@@ -46,4 +44,19 @@ build/
 *.swp
 
 # .DS_Store files
-.DS_Store
+.DS_Store
+
+# wheel files
+*.whl
+*.tar.gz
+*.zip
+
+# Dockerfiles and images (root only)
+/Dockerfile*
+/docker-compose.yml
+/docker-compose.override.yml
+/docker-compose.*.yml
+
+# Virtual environments
+*venv*/
+**/*venv*/

.gitignore

@@ -1,25 +1,55 @@
 # mssql-python
 
-This is a new Python driver for Microsoft SQL Server currently in Alpha phase.
+mssql-python is a new first-party SQL Server driver for Python that has all of the benefits of a fresh start while preserving a familiar experience for developers.
+
+## What makes mssql-python different?
+
+### Powered by DDBC – Direct Database Connectivity
+
+Most Python SQL Server drivers, including pyodbc, route calls through the Driver Manager, which has slightly different implementations across Windows, macOS, and Linux. This results in inconsistent behavior and capabilities across platforms. Additionally, the Driver Manager must be installed separately, creating friction for both new developers and when deploying applications to servers.
+
+At the heart of the driver is DDBC (Direct Database Connectivity) — a lightweight, high-performance C++ layer that replaces the platform’s Driver Manager.
+
+Key Advantages:
+
+- Provides a consistent, cross-platform backend that handles connections, statements, and memory directly.
+- Interfaces directly with the native SQL Server drivers.
+- Integrates with the same TDS core library that powers the ODBC driver.
+
+### Why is this architecture important?
+
+By simplifying the architecture, DDBC delivers:
+
+- Consistency across platforms
+- Lower function call overhead
+- Zero external dependencies on Windows (`pip install mssql-python` is all you need)
+- Full control over connections, memory, and statement handling
+
+### Built with PyBind11 + Modern C++ for Performance and Safety
+
+To expose the DDBC engine to Python, mssql-python uses PyBind11 – a modern C++ binding library, instead of ctypes. With ctypes, every call between Python and the ODBC driver involved costly type conversions, manual pointer management, resulting in slow and potentially unsafe code.
+
+PyBind11 provides:
+
+- Native-speed execution with automatic type conversions
+- Memory-safe bindings
+- Clean and Pythonic API, while performance-critical logic remains in robust, maintainable C++.
 
 ## Public Preview Release
 
-We are making progress - The Public Preview of our driver is now available! This marks a significant milestone in our development journey. While we saw a few early adopters of our alpha release, we are introducing the following functionalities to support your applications in a more robust and reliable manner.
+We are currently in **Public Preview**.
 
-### What's Included:
+## What's new in v0.13.0
 
-- Everything from previous releases
-- **Alpine Linux Support:** Added full support for Alpine Linux distribution (musllinux) with specialized driver handling and fixes for musl libc compatibility.
-- **Connection Management Improvements:** Fixed autocommit to be False by default and added automatic rollback on connection close for better transaction control.
-- **PyODBC Compatibility:** Enhanced type objects and constructor compatibility with pyodbc for seamless migration and interoperability.
+- **Enhanced Batch Operations:** Complete support for UNIQUEIDENTIFIER and DATETIMEOFFSET in `executemany()` operations with automatic type inference, enabling efficient bulk inserts of complex data types including UUIDs and timezone-aware datetimes.
+- **Streaming Large Values:** Robust handling of large objects (NVARCHAR/VARCHAR/VARBINARY(MAX)) in `executemany()` with automatic Data-At-Execution detection and fallback, supporting streaming inserts and fetches for massive datasets.
+- **Improved Cursor Reliability:** Enhanced `cursor.rowcount` accuracy across all fetch operations, including proper handling of empty result sets and consistent behavior for SELECT, INSERT, and UPDATE operations.
+- **Critical Stability Fixes:** Resolved memory leaks with secure token buffer handling, fixed resource cleanup to prevent segmentation faults during Python shutdown, and corrected type inference bugs in batch operations.
 
 For more information, please visit the project link on Github: https://github.com/microsoft/mssql-python
 
-### What's Next:
-
-As we continue to develop and refine the driver, you can expect regular updates that will introduce new features, optimizations, and bug fixes. We encourage you to contribute, provide feedback and report any issues you encounter, as this will help us improve the driver for the final release.
+If you have any feedback, questions or need support please mail us at mssql-python@microsoft.com.
 
-### Stay Tuned:
+## What's Next
 
-We appreciate your interest and support in this project. Stay tuned for more updates and enhancements as we work towards delivering a robust and fully-featured driver in coming months.
-Thank you for being a part of our journey!
+As we continue to develop and refine the driver, you can expect regular updates that will introduce new features, optimizations, and bug fixes. We encourage you to contribute, provide feedback and report any issues you encounter, as this will help us improve the driver ahead of General Availability.

PyPI_Description.md

@@ -24,25 +24,30 @@ pip install mssql-python
 **Linux:** mssql-python can be installed with [pip](http://pypi.python.org/pypi/pip)
 ```bash
 # For Alpine
-apk add libtool krb5-libs
+apk add libtool krb5-libs krb5-dev
 
-# For Debian/Ubuntu
-apt-get install -y libltdl7
+# For Debian/Ubuntu  
+apt-get install -y libltdl7 libkrb5-3 libgssapi-krb5-2
 
 # For RHEL
-dnf install -y libtool-ltdl
+dnf install -y libtool-ltdl krb5-libs
+
+# For SUSE
+zypper install -y libltdl7 libkrb5-3 libgssapi-krb5-2
+
+# For SUSE/openSUSE
+zypper install -y libltdl7
 
 pip install mssql-python
 ```
 
 ## Key Features
 ### Supported Platforms
 
-Windows, MacOS and Linux (manylinux - Debian, Ubuntu, RHEL & musllinux - Alpine)
+Windows, MacOS and Linux (manylinux - Debian, Ubuntu, RHEL, SUSE (x64 only) & musllinux - Alpine)
 
 > **Note:**
-> Support for additional Linux OSs (SUSE Linux) will come soon
->
+> SUSE Linux ARM64 is not supported by Microsoft ODBC Driver. Use x64 architecture for SUSE deployments.
  
 ### DBAPI v2.0 Compliance
 

README.md

@@ -258,6 +258,9 @@ jobs:
     # Install CMake on macOS
     - script: |
         brew update
+        # Uninstall existing CMake to avoid tap conflicts
+        brew uninstall cmake --ignore-dependencies || echo "CMake not installed or already removed"
+        # Install CMake from homebrew/core
         brew install cmake
       displayName: 'Install CMake'
 
@@ -337,7 +340,7 @@ jobs:
         python -m pytest -v
       displayName: 'Run Pytest to validate bindings'
       env:
-        DB_CONNECTION_STRING: 'Driver=ODBC Driver 18 for SQL Server;Server=localhost;Database=master;Uid=SA;Pwd=$(DB_PASSWORD);TrustServerCertificate=yes'
+        DB_CONNECTION_STRING: 'Driver=ODBC Driver 18 for SQL Server;Server=tcp:127.0.0.1,1433;Database=master;Uid=SA;Pwd=$(DB_PASSWORD);TrustServerCertificate=yes'
 
     # Build wheel package for universal2
     - script: |

eng/pipelines/build-whl-pipeline.yml

@@ -7,6 +7,44 @@ trigger:
       - main
 
 jobs:
+- job: CodeQLAnalysis
+  displayName: 'CodeQL Security Analysis'
+  pool:
+    vmImage: 'ubuntu-latest'
+  
+  steps:
+  - script: |
+      sudo apt-get update
+      sudo apt-get install -y build-essential cmake curl git python3 python3-pip python3-dev python3-venv unixodbc-dev
+    displayName: 'Install build dependencies for CodeQL'
+
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.13'
+      addToPath: true
+    displayName: 'Use Python 3.13 for CodeQL'
+
+  - script: |
+      python -m pip install --upgrade pip
+      pip install -r requirements.txt
+    displayName: 'Install Python dependencies for CodeQL'
+
+  - task: CodeQL3000Init@0
+    inputs:
+      Enabled: true
+    displayName: 'Initialize CodeQL'
+
+  # Build the C++ extension for CodeQL analysis
+  - script: |
+      cd mssql_python/pybind
+      chmod +x build.sh
+      ./build.sh
+    displayName: 'Build C++ extension for CodeQL analysis'
+
+  - task: CodeQL3000Finalize@0
+    condition: always()
+    displayName: 'Finalize CodeQL'
+
 - job: PytestOnWindows
   displayName: 'Windows x64'
   pool:
@@ -72,11 +110,11 @@ jobs:
       testResultsFiles: '**/test-results.xml'
       testRunTitle: 'Publish test results'
 
-  - task: PublishCodeCoverageResults@1
-    inputs:
-      codeCoverageTool: 'Cobertura'
-      summaryFileLocation: 'coverage.xml'
-    displayName: 'Publish code coverage results'
+  # - task: PublishCodeCoverageResults@1
+  #   inputs:
+  #     codeCoverageTool: 'Cobertura'
+  #     summaryFileLocation: 'coverage.xml'
+  #   displayName: 'Publish code coverage results'
 
 - job: PytestOnMacOS
   displayName: 'macOS x86_64'
@@ -92,6 +130,9 @@ jobs:
 
   - script: |
       brew update
+      # Uninstall existing CMake to avoid tap conflicts
+      brew uninstall cmake --ignore-dependencies || echo "CMake not installed or already removed"
+      # Install CMake from homebrew/core
       brew install cmake
     displayName: 'Install CMake'
 
@@ -149,7 +190,7 @@ jobs:
       python -m pytest -v --junitxml=test-results.xml --cov=. --cov-report=xml --capture=tee-sys --cache-clear
     displayName: 'Run pytest with coverage'
     env:
-      DB_CONNECTION_STRING: 'Driver=ODBC Driver 18 for SQL Server;Server=localhost;Database=master;Uid=SA;Pwd=$(DB_PASSWORD);TrustServerCertificate=yes'
+      DB_CONNECTION_STRING: 'Driver=ODBC Driver 18 for SQL Server;Server=tcp:127.0.0.1,1433;Database=master;Uid=SA;Pwd=$(DB_PASSWORD);TrustServerCertificate=yes'
       DB_PASSWORD: $(DB_PASSWORD)
 
   - task: PublishTestResults@2
@@ -1474,3 +1515,79 @@ jobs:
     inputs:
       testResultsFiles: '**/test-results-alpine-arm64.xml'
       testRunTitle: 'Publish pytest results on Alpine ARM64'
+
+- job: CodeCoverageReport
+  displayName: 'Full Code Coverage Report in Ubuntu x86_64'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - script: |
+      # Install build dependencies
+      sudo apt-get update
+      sudo apt-get install -y cmake gcc g++ lcov unixodbc-dev llvm clang
+    displayName: 'Install build dependencies'
+
+  - script: |
+      # Start SQL Server container
+      docker pull mcr.microsoft.com/mssql/server:2022-latest
+      docker run \
+        --name sqlserver \
+        -e ACCEPT_EULA=Y \
+        -e MSSQL_SA_PASSWORD="$(DB_PASSWORD)" \
+        -p 1433:1433 \
+        -d mcr.microsoft.com/mssql/server:2022-latest
+
+      # Wait until SQL Server is ready
+      for i in {1..30}; do
+        docker exec sqlserver \
+          /opt/mssql-tools18/bin/sqlcmd \
+          -S localhost \
+          -U SA \
+          -P "$(DB_PASSWORD)" \
+          -C -Q "SELECT 1" && break
+        sleep 2
+      done
+    displayName: 'Start SQL Server container'
+    env:
+      DB_PASSWORD: $(DB_PASSWORD)
+
+  - script: |
+      # Install Python dependencies
+      python -m pip install --upgrade pip
+      pip install -r requirements.txt
+      pip install coverage-lcov lcov-cobertura
+    displayName: 'Install Python dependencies'
+
+  - script: |
+      # Build pybind bindings with coverage instrumentation
+      cd mssql_python/pybind
+      ./build.sh codecov
+    displayName: 'Build pybind bindings with coverage'
+
+  - script: |
+      # Generate unified coverage (Python + C++)
+      chmod +x ./generate_codecov.sh
+      ./generate_codecov.sh
+
+      # Convert unified LCOV to Cobertura XML for ADO reporting
+      lcov_cobertura total.info --output unified-coverage/coverage.xml
+    displayName: 'Generate unified coverage (Python + C++)'
+    env:
+      DB_CONNECTION_STRING: 'Driver=ODBC Driver 18 for SQL Server;Server=tcp:127.0.0.1,1433;Database=master;Uid=SA;Pwd=$(DB_PASSWORD);TrustServerCertificate=yes'
+      DB_PASSWORD: $(DB_PASSWORD)
+
+  - task: PublishTestResults@2
+    condition: succeededOrFailed()
+    inputs:
+      testResultsFiles: '**/test-results.xml'
+      testRunTitle: 'Publish pytest results with unified coverage'
+
+  - task: PublishCodeCoverageResults@2
+    condition: succeededOrFailed()
+    inputs:
+      codeCoverageTool: Cobertura
+      summaryFileLocation: 'unified-coverage/coverage.xml'
+      reportDirectory: 'unified-coverage'
+      failIfCoverageEmpty: true
+    displayName: 'Publish unified code coverage results'