Merge remote-tracking branch 'origin/main' into saumya/pool-c++

Author: gargsaumya

mssql_python/bcp_options.py

@@ -0,0 +1,121 @@
+from dataclasses import dataclass, field
+from typing import List, Optional, Literal
+
+
+@dataclass
+class ColumnFormat:
+    """
+    Represents the format of a column in a bulk copy operation.
+    Attributes:
+        prefix_len (int): Option: (format_file) or (prefix_len, data_len).
+            The length of the prefix for fixed-length data types. Must be non-negative.
+        data_len (int): Option: (format_file) or (prefix_len, data_len).
+            The length of the data. Must be non-negative.
+        field_terminator (Optional[bytes]): Option: (-t). The field terminator string.
+            e.g., b',' for comma-separated values.
+        row_terminator (Optional[bytes]): Option: (-r). The row terminator string.
+            e.g., b'\\n' for newline-terminated rows.
+        server_col (int): Option: (format_file) or (server_col). The 1-based column number
+            in the SQL Server table. Defaults to 1, representing the first column.
+            Must be a positive integer.
+        file_col (int): Option: (format_file) or (file_col). The 1-based column number
+            in the data file. Defaults to 1, representing the first column.
+            Must be a positive integer.
+    """
+
+    prefix_len: int
+    data_len: int
+    field_terminator: Optional[bytes] = None
+    row_terminator: Optional[bytes] = None
+    server_col: int = 1
+    file_col: int = 1
+
+    def __post_init__(self):
+        if self.prefix_len < 0:
+            raise ValueError("prefix_len must be a non-negative integer.")
+        if self.data_len < 0:
+            raise ValueError("data_len must be a non-negative integer.")
+        if self.server_col <= 0:
+            raise ValueError("server_col must be a positive integer (1-based).")
+        if self.file_col <= 0:
+            raise ValueError("file_col must be a positive integer (1-based).")
+        if self.field_terminator is not None and not isinstance(
+            self.field_terminator, bytes
+        ):
+            raise TypeError("field_terminator must be bytes or None.")
+        if self.row_terminator is not None and not isinstance(
+            self.row_terminator, bytes
+        ):
+            raise TypeError("row_terminator must be bytes or None.")
+
+
+@dataclass
+class BCPOptions:
+    """
+    Represents the options for a bulk copy operation.
+    Attributes:
+        direction (Literal[str]): 'in' or 'out'. Option: (-i or -o).
+        data_file (str): The data file. Option: (positional argument).
+        error_file (Optional[str]): The error file. Option: (-e).
+        format_file (Optional[str]): The format file to use for 'in'/'out'. Option: (-f).
+        batch_size (Optional[int]): The batch size. Option: (-b).
+        max_errors (Optional[int]): The maximum number of errors allowed. Option: (-m).
+        first_row (Optional[int]): The first row to process. Option: (-F).
+        last_row (Optional[int]): The last row to process. Option: (-L).
+        code_page (Optional[str]): The code page. Option: (-C).
+        keep_identity (bool): Keep identity values. Option: (-E).
+        keep_nulls (bool): Keep null values. Option: (-k).
+        hints (Optional[str]): Additional hints. Option: (-h).
+        bulk_mode (str): Bulk mode ('native', 'char', 'unicode'). Option: (-n, -c, -w).
+            Defaults to "native".
+        columns (List[ColumnFormat]): Column formats.
+    """
+
+    direction: Literal["in", "out"]
+    data_file: str  # data_file is mandatory for 'in' and 'out'
+    error_file: Optional[str] = None
+    format_file: Optional[str] = None
+    # write_format_file is removed as 'format' direction is not actively supported
+    batch_size: Optional[int] = None
+    max_errors: Optional[int] = None
+    first_row: Optional[int] = None
+    last_row: Optional[int] = None
+    code_page: Optional[str] = None
+    keep_identity: bool = False
+    keep_nulls: bool = False
+    hints: Optional[str] = None
+    bulk_mode: Literal["native", "char", "unicode"] = "native"
+    columns: List[ColumnFormat] = field(default_factory=list)
+
+    def __post_init__(self):
+        if self.direction not in ["in", "out"]:
+            raise ValueError("direction must be 'in' or 'out'.")
+        if not self.data_file:
+            raise ValueError("data_file must be provided and non-empty for 'in' or 'out' directions.")
+        if self.error_file is None or not self.error_file:  # Making error_file mandatory for in/out
+            raise ValueError("error_file must be provided and non-empty for 'in' or 'out' directions.")
+
+        if self.format_file is not None and not self.format_file:
+            raise ValueError("format_file, if provided, must not be an empty string.")
+        if self.batch_size is not None and self.batch_size <= 0:
+            raise ValueError("batch_size must be a positive integer.")
+        if self.max_errors is not None and self.max_errors < 0:
+            raise ValueError("max_errors must be a non-negative integer.")
+        if self.first_row is not None and self.first_row <= 0:
+            raise ValueError("first_row must be a positive integer.")
+        if self.last_row is not None and self.last_row <= 0:
+            raise ValueError("last_row must be a positive integer.")
+        if self.last_row is not None and self.first_row is None:
+            raise ValueError("first_row must be specified if last_row is specified.")
+        if (
+            self.first_row is not None
+            and self.last_row is not None
+            and self.last_row < self.first_row
+        ):
+            raise ValueError("last_row must be greater than or equal to first_row.")
+        if self.code_page is not None and not self.code_page:
+            raise ValueError("code_page, if provided, must not be an empty string.")
+        if self.hints is not None and not self.hints:
+            raise ValueError("hints, if provided, must not be an empty string.")
+        if self.bulk_mode not in ["native", "char", "unicode"]:
+            raise ValueError("bulk_mode must be 'native', 'char', or 'unicode'.")

mssql_python/pybind/connection/connection.cpp

@@ -6,6 +6,7 @@
 
 #include "connection.h"
 #include "connection_pool.h"
+
 #include <vector>
 #include <pybind11/pybind11.h>
 
@@ -285,4 +286,4 @@ SqlHandlePtr ConnectionHandle::allocStatementHandle() {
         ThrowStdException("Connection object is not initialized");
     }
     return _conn->allocStatementHandle();
-}
+}

mssql_python/pybind/ddbc_bindings.cpp

@@ -5,7 +5,10 @@
 //             taken up in beta release
 #include "ddbc_bindings.h"
 #include "connection/connection.h"
+<<<<<<< HEAD
 #include "connection/connection_pool.h"
+=======
+>>>>>>> origin/main
 
 #include <cstdint>
 #include <iomanip>  // std::setw, std::setfill