Fix: Update pyodbc dependency version and remove assertion of add_output_converter

Author: mattiasthalen

pyproject.toml

@@ -40,7 +40,7 @@ classifiers = [
 [project.optional-dependencies]
 athena = ["PyAthena[Pandas]"]
 azuresql = ["pymssql"]
-azuresql-odbc = ["pyodbc"]
+azuresql-odbc = ["pyodbc>=5.0.0"]
 bigquery = [
     "google-cloud-bigquery[pandas]",
     "google-cloud-bigquery-storage"
@@ -78,7 +78,7 @@ dev = [
     "pydantic",
     "PyAthena[Pandas]",
     "PyGithub>=2.6.0",
-    "pyodbc",
+    "pyodbc>=5.0.0",
     "pyperf",
     "pyspark~=3.5.0",
     "pytest",
@@ -108,7 +108,7 @@ github = ["PyGithub~=2.5.0"]
 llm = ["langchain", "openai"]
 motherduck = ["duckdb>=1.2.0"]
 mssql = ["pymssql"]
-mssql-odbc = ["pyodbc"]
+mssql-odbc = ["pyodbc>=5.0.0"]
 mysql = ["pymysql"]
 mwaa = ["boto3"]
 postgres = ["psycopg2"]

sqlmesh/core/config/connection.py

@@ -1630,28 +1630,27 @@ def connect(**kwargs: t.Any) -> t.Callable:
             conn = pyodbc.connect(conn_str, autocommit=kwargs.get("autocommit", False))
 
             # Set up output converters for MSSQL-specific data types
-            if hasattr(conn, "add_output_converter"):
-                # Handle SQL type -155 (DATETIMEOFFSET) which is not yet supported by pyodbc
-                # ref: https://github.com/mkleehammer/pyodbc/issues/134#issuecomment-281739794
-                def handle_datetimeoffset(dto_value: t.Any) -> t.Any:
-                    from datetime import datetime, timedelta, timezone
-                    import struct
-
-                    # Unpack the DATETIMEOFFSET binary format:
-                    # Format: <6hI2h = (year, month, day, hour, minute, second, nanoseconds, tz_hour_offset, tz_minute_offset)
-                    tup = struct.unpack("<6hI2h", dto_value)
-                    return datetime(
-                        tup[0],
-                        tup[1],
-                        tup[2],
-                        tup[3],
-                        tup[4],
-                        tup[5],
-                        tup[6] // 1000,
-                        timezone(timedelta(hours=tup[7], minutes=tup[8])),
-                    )
+            # Handle SQL type -155 (DATETIMEOFFSET) which is not yet supported by pyodbc
+            # ref: https://github.com/mkleehammer/pyodbc/issues/134#issuecomment-281739794
+            def handle_datetimeoffset(dto_value: t.Any) -> t.Any:
+                from datetime import datetime, timedelta, timezone
+                import struct
+
+                # Unpack the DATETIMEOFFSET binary format:
+                # Format: <6hI2h = (year, month, day, hour, minute, second, nanoseconds, tz_hour_offset, tz_minute_offset)
+                tup = struct.unpack("<6hI2h", dto_value)
+                return datetime(
+                    tup[0],
+                    tup[1],
+                    tup[2],
+                    tup[3],
+                    tup[4],
+                    tup[5],
+                    tup[6] // 1000,
+                    timezone(timedelta(hours=tup[7], minutes=tup[8])),
+                )
 
-                conn.add_output_converter(-155, handle_datetimeoffset)
+            conn.add_output_converter(-155, handle_datetimeoffset)
 
             return conn
 

tests/core/test_connection_config.py

@@ -1685,32 +1685,6 @@ def mock_add_output_converter(sql_type, converter_func):
         assert result.tzinfo == timezone(timedelta(hours=-8))
 
 
-def test_mssql_pyodbc_connection_no_add_output_converter():
-    """Test that connection gracefully handles pyodbc without add_output_converter."""
-    from unittest.mock import Mock, patch
-
-    with patch("pyodbc.connect") as mock_pyodbc_connect:
-        # Create a mock connection without add_output_converter
-        mock_connection = Mock()
-        # Remove the add_output_converter attribute
-        if hasattr(mock_connection, "add_output_converter"):
-            delattr(mock_connection, "add_output_converter")
-        mock_pyodbc_connect.return_value = mock_connection
-
-        config = MSSQLConnectionConfig(
-            host="localhost",
-            driver="pyodbc",  # DATETIMEOFFSET handling is pyodbc-specific
-            check_import=False,
-        )
-
-        # This should not raise an exception
-        factory_with_kwargs = config._connection_factory_with_kwargs
-        connection = factory_with_kwargs()
-
-        # Verify we get the connection back
-        assert connection is mock_connection
-
-
 def test_mssql_no_cursor_init_for_pymssql():
     """Test that _cursor_init is not needed for pymssql driver."""
     config = MSSQLConnectionConfig(