FIX: forward connection timeout to bulkcopy pycore connection

mssql_python/cursor.py

@@ -2955,6 +2955,20 @@ def bulkcopy(
  # Translate parsed connection string into the dict py-core expects.
  pycore_context = connstr_to_pycore_params(params)
 
+ # Forward the cursor's query timeout to py-core so the bulkcopy
+ # connection uses the same limit instead of py-core's compiled-in 15s
+ # default. _timeout is the snapshot taken at cursor creation (same value
+ # _set_timeout uses). Accept any int the public Connection.timeout setter
+ # accepts (including IntEnum) but exclude bool, then normalise to a plain
+ # int so py-core's u32 extract is unambiguous. 0 stays a "no override":
+ # py-core's default connect path treats 0 as no deadline, but its TCP
+ # attempt path turns 0 into a 0ms timeout that fails instantly, so we
+ # leave 0 unset and let py-core apply its own 15s default.
+ connect_timeout = self._timeout
+ if isinstance(connect_timeout, int) and not isinstance(connect_timeout, bool):
+ if connect_timeout > 0:
+ pycore_context["connect_timeout"] = int(connect_timeout)
+
  # Token acquisition — only thing cursor must handle (needs azure-identity SDK)
  if self.connection._auth_type:
  # Fresh token acquisition for mssql-py-core connection

tests/test_008_auth.py

@@ -586,6 +586,7 @@ def test_bulkcopy_path_preserves_user_assigned_msi_client_id(self):
 
  cursor = Cursor.__new__(Cursor)
  cursor._connection = mock_conn
+ cursor._timeout = 0
  cursor.closed = False
  cursor.hstmt = None
 

tests/test_020_bulkcopy_auth_cleanup.py

@@ -10,6 +10,7 @@
 """
 
 import secrets
+from enum import IntEnum
 from unittest.mock import MagicMock, patch
 
 SAMPLE_TOKEN = secrets.token_hex(44)
@@ -26,6 +27,7 @@
 
  cursor = Cursor.__new__(Cursor)
  cursor._connection = mock_conn
+ cursor._timeout = 0
  cursor.closed = False
  cursor.hstmt = None
  return cursor
@@ -108,3 +110,94 @@
  assert "access_token" not in captured_context
  assert captured_context.get("user_name") == "sa"
  assert captured_context.get("password") == "mypwd"
+
+
+def _capture_bulkcopy_context(cursor):
+ """Run bulkcopy with a mocked pycore module and return the captured context."""
+ captured_context = {}
+
+ mock_pycore_cursor = MagicMock()
+ mock_pycore_cursor.bulkcopy.return_value = {
+ "rows_copied": 1,
+ "batch_count": 1,
+ "elapsed_time": 0.1,
+ }
+ mock_pycore_conn = MagicMock()
+ mock_pycore_conn.cursor.return_value = mock_pycore_cursor
+
+ def capture_context(ctx, **kwargs):
+ captured_context.update(ctx)
+ return mock_pycore_conn
+
+ mock_pycore_module = MagicMock()
+ mock_pycore_module.PyCoreConnection = capture_context
+
+ with patch.dict("sys.modules", {"mssql_py_core": mock_pycore_module}):
+ cursor.bulkcopy("dbo.test_table", [(1, "row")], timeout=10)
+
+ return captured_context
+
+
+class TestBulkcopyConnectTimeout:
+ """Verify cursor.bulkcopy forwards the cursor timeout to pycore (issue #626)."""
+
+ @patch("mssql_python.cursor.logger")
+ def test_positive_timeout_forwarded(self, mock_logger):
+ """cursor._timeout > 0 ⇒ connect_timeout reaches pycore, overriding 15s."""
+ mock_logger.is_debug_enabled = False
+ cursor = _make_cursor("Server=localhost;Database=testdb;UID=sa;PWD=pwd", None)
+ cursor._timeout = 30
+
+ captured = _capture_bulkcopy_context(cursor)
+
+ assert captured.get("connect_timeout") == 30
+
+ @patch("mssql_python.cursor.logger")
+ def test_zero_timeout_not_forwarded(self, mock_logger):
+ """cursor._timeout == 0 ⇒ no override, pycore keeps its default."""
+ mock_logger.is_debug_enabled = False
+ cursor = _make_cursor("Server=localhost;Database=testdb;UID=sa;PWD=pwd", None)
+ cursor._timeout = 0
+
+ captured = _capture_bulkcopy_context(cursor)
+
+ assert "connect_timeout" not in captured
+
+ @patch("mssql_python.cursor.logger")
+ def test_uses_cursor_snapshot_not_live_connection(self, mock_logger):
+ """timeout is the cursor snapshot; later connection changes don't apply."""
+ mock_logger.is_debug_enabled = False
+ cursor = _make_cursor("Server=localhost;Database=testdb;UID=sa;PWD=pwd", None)
+ cursor._timeout = 45
+ cursor._connection.timeout = 99 # changed after cursor creation, must be ignored
+
+ captured = _capture_bulkcopy_context(cursor)
+
+ assert captured.get("connect_timeout") == 45
+
+ @patch("mssql_python.cursor.logger")
+ def test_intenum_timeout_forwarded_as_plain_int(self, mock_logger):
+ """IntEnum (accepted by the public setter) is forwarded, normalised to int."""
+ mock_logger.is_debug_enabled = False
+
+ class _T(IntEnum):
+ thirty = 30
+
+ cursor = _make_cursor("Server=localhost;Database=testdb;UID=sa;PWD=pwd", None)
+ cursor._timeout = _T.thirty
+
+ captured = _capture_bulkcopy_context(cursor)
+
+ assert captured.get("connect_timeout") == 30
+ assert type(captured.get("connect_timeout")) is int
+
+ @patch("mssql_python.cursor.logger")
+ def test_bool_timeout_not_forwarded(self, mock_logger):
+ """bool is a subclass of int but must not be treated as a timeout."""
+ mock_logger.is_debug_enabled = False
+ cursor = _make_cursor("Server=localhost;Database=testdb;UID=sa;PWD=pwd", None)
+ cursor._timeout = True
+
+ captured = _capture_bulkcopy_context(cursor)
+
+ assert "connect_timeout" not in captured