sqlmesh 0.191.1.dev1__tar.gz → 0.191.1.dev3__tar.gz

{sqlmesh-0.191.1.dev1 → sqlmesh-0.191.1.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.191.1.dev1
+Version: 0.191.1.dev3
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License
@@ -233,7 +233,7 @@ Requires-Dist: pydantic>=2.0.0
 Requires-Dist: requests
 Requires-Dist: rich[jupyter]
 Requires-Dist: ruamel.yaml
-Requires-Dist: sqlglot[rs]~=26.26.0
+Requires-Dist: sqlglot[rs]~=26.27.0
 Requires-Dist: tenacity
 Requires-Dist: time-machine
 Requires-Dist: json-stream
@@ -241,6 +241,8 @@ Provides-Extra: athena
 Requires-Dist: PyAthena[Pandas]; extra == "athena"
 Provides-Extra: azuresql
 Requires-Dist: pymssql; extra == "azuresql"
+Provides-Extra: azuresql-odbc
+Requires-Dist: pyodbc; extra == "azuresql-odbc"
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery[pandas]; extra == "bigquery"
 Requires-Dist: google-cloud-bigquery-storage; extra == "bigquery"
@@ -311,6 +313,8 @@ Requires-Dist: langchain; extra == "llm"
 Requires-Dist: openai; extra == "llm"
 Provides-Extra: mssql
 Requires-Dist: pymssql; extra == "mssql"
+Provides-Extra: mssql-odbc
+Requires-Dist: pyodbc; extra == "mssql-odbc"
 Provides-Extra: mysql
 Requires-Dist: pymysql; extra == "mysql"
 Provides-Extra: mwaa

{sqlmesh-0.191.1.dev1 → sqlmesh-0.191.1.dev3}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
     "requests",
     "rich[jupyter]",
     "ruamel.yaml",
-    "sqlglot[rs]~=26.26.0",
+    "sqlglot[rs]~=26.27.0",
     "tenacity",
     "time-machine",
     "json-stream"
@@ -39,6 +39,7 @@ classifiers = [
 [project.optional-dependencies]
 athena = ["PyAthena[Pandas]"]
 azuresql = ["pymssql"]
+azuresql-odbc = ["pyodbc"]
 bigquery = [
     "google-cloud-bigquery[pandas]",
     "google-cloud-bigquery-storage"
@@ -104,6 +105,7 @@ gcppostgres = ["cloud-sql-python-connector[pg8000]>=1.8.0"]
 github = ["PyGithub~=2.5.0"]
 llm = ["langchain", "openai"]
 mssql = ["pymssql"]
+mssql-odbc = ["pyodbc"]
 mysql = ["pymysql"]
 mwaa = ["boto3"]
 postgres = ["psycopg2"]
@@ -203,6 +205,7 @@ module = [
     "databricks_cli.*",
     "mysql.*",
     "pymssql.*",
+    "pyodbc.*",
     "psycopg2.*",
     "langchain.*",
     "pytest_lazyfixture.*",

{sqlmesh-0.191.1.dev1 → sqlmesh-0.191.1.dev3}/sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.191.1.dev1'
-__version_tuple__ = version_tuple = (0, 191, 1, 'dev1')
+__version__ = version = '0.191.1.dev3'
+__version_tuple__ = version_tuple = (0, 191, 1, 'dev3')

{sqlmesh-0.191.1.dev1 → sqlmesh-0.191.1.dev3}/sqlmesh/core/config/connection.py

@@ -55,11 +55,10 @@ MOTHERDUCK_TOKEN_REGEX = re.compile(r"(\?|\&)(motherduck_token=)(\S*)")
 
 
 def _get_engine_import_validator(
-    import_name: str, engine_type: str, extra_name: t.Optional[str] = None
+    import_name: str, engine_type: str, extra_name: t.Optional[str] = None, decorate: bool = True
 ) -> t.Callable:
     extra_name = extra_name or engine_type
 
-    @model_validator(mode="before")
     def validate(cls: t.Any, data: t.Any) -> t.Any:
         check_import = (
             str_to_bool(str(data.pop("check_import", True))) if isinstance(data, dict) else True
@@ -83,7 +82,7 @@ def _get_engine_import_validator(
 
         return data
 
-    return validate
+    return model_validator(mode="before")(validate) if decorate else validate
 
 
 class ConnectionConfig(abc.ABC, BaseConfig):
@@ -1422,17 +1421,50 @@ class MSSQLConnectionConfig(ConnectionConfig):
     autocommit: t.Optional[bool] = False
     tds_version: t.Optional[str] = None
 
+    # Driver options
+    driver: t.Literal["pymssql", "pyodbc"] = "pymssql"
+    # PyODBC specific options
+    driver_name: t.Optional[str] = None  # e.g. "ODBC Driver 18 for SQL Server"
+    trust_server_certificate: t.Optional[bool] = None
+    encrypt: t.Optional[bool] = None
+    # Dictionary of arbitrary ODBC connection properties
+    # See: https://learn.microsoft.com/en-us/sql/connect/odbc/dsn-connection-string-attribute
+    odbc_properties: t.Optional[t.Dict[str, t.Any]] = None
+
     concurrent_tasks: int = 4
     register_comments: bool = True
     pre_ping: bool = True
 
     type_: t.Literal["mssql"] = Field(alias="type", default="mssql")
 
-    _engine_import_validator = _get_engine_import_validator("pymssql", "mssql")
+    @model_validator(mode="before")
+    @classmethod
+    def _mssql_engine_import_validator(cls, data: t.Any) -> t.Any:
+        if not isinstance(data, dict):
+            return data
+
+        driver = data.get("driver", "pymssql")
+
+        # Define the mapping of driver to import module and extra name
+        driver_configs = {"pymssql": ("pymssql", "mssql"), "pyodbc": ("pyodbc", "mssql-odbc")}
+
+        if driver not in driver_configs:
+            raise ValueError(f"Unsupported driver: {driver}")
+
+        import_module, extra_name = driver_configs[driver]
+
+        # Use _get_engine_import_validator with decorate=False to get the raw validation function
+        # This avoids the __wrapped__ issue in Python 3.9
+        validator_func = _get_engine_import_validator(
+            import_module, driver, extra_name, decorate=False
+        )
+
+        # Call the raw validation function directly
+        return validator_func(cls, data)
 
     @property
     def _connection_kwargs_keys(self) -> t.Set[str]:
-        return {
+        base_keys = {
             "host",
             "user",
             "password",
@@ -1447,15 +1479,96 @@ class MSSQLConnectionConfig(ConnectionConfig):
             "tds_version",
         }
 
+        if self.driver == "pyodbc":
+            base_keys.update(
+                {
+                    "driver_name",
+                    "trust_server_certificate",
+                    "encrypt",
+                    "odbc_properties",
+                }
+            )
+            # Remove pymssql-specific parameters
+            base_keys.discard("tds_version")
+            base_keys.discard("conn_properties")
+
+        return base_keys
+
     @property
     def _engine_adapter(self) -> t.Type[EngineAdapter]:
         return engine_adapter.MSSQLEngineAdapter
 
     @property
     def _connection_factory(self) -> t.Callable:
-        import pymssql
+        if self.driver == "pymssql":
+            import pymssql
+
+            return pymssql.connect
+
+        import pyodbc
+
+        def connect(**kwargs: t.Any) -> t.Callable:
+            # Extract parameters for connection string
+            host = kwargs.pop("host")
+            port = kwargs.pop("port", 1433)
+            database = kwargs.pop("database", "")
+            user = kwargs.pop("user", None)
+            password = kwargs.pop("password", None)
+            driver_name = kwargs.pop("driver_name", "ODBC Driver 18 for SQL Server")
+            trust_server_certificate = kwargs.pop("trust_server_certificate", False)
+            encrypt = kwargs.pop("encrypt", True)
+            login_timeout = kwargs.pop("login_timeout", 60)
+
+            # Build connection string
+            conn_str_parts = [
+                f"DRIVER={{{driver_name}}}",
+                f"SERVER={host},{port}",
+            ]
+
+            if database:
+                conn_str_parts.append(f"DATABASE={database}")
+
+            # Add security options
+            conn_str_parts.append(f"Encrypt={'YES' if encrypt else 'NO'}")
+            if trust_server_certificate:
+                conn_str_parts.append("TrustServerCertificate=YES")
+
+            conn_str_parts.append(f"Connection Timeout={login_timeout}")
+
+            # Standard SQL Server authentication
+            if user:
+                conn_str_parts.append(f"UID={user}")
+            if password:
+                conn_str_parts.append(f"PWD={password}")
+
+            # Add any additional ODBC properties from the odbc_properties dictionary
+            if self.odbc_properties:
+                for key, value in self.odbc_properties.items():
+                    # Skip properties that we've already set above
+                    if key.lower() in (
+                        "driver",
+                        "server",
+                        "database",
+                        "uid",
+                        "pwd",
+                        "encrypt",
+                        "trustservercertificate",
+                        "connection timeout",
+                    ):
+                        continue
 
-        return pymssql.connect
+                    # Handle boolean values properly
+                    if isinstance(value, bool):
+                        conn_str_parts.append(f"{key}={'YES' if value else 'NO'}")
+                    else:
+                        conn_str_parts.append(f"{key}={value}")
+
+            # Create the connection string
+            conn_str = ";".join(conn_str_parts)
+
+            return pyodbc.connect(conn_str, autocommit=kwargs.get("autocommit", False))
+
+        return connect
 
     @property
     def _extra_engine_config(self) -> t.Dict[str, t.Any]:

{sqlmesh-0.191.1.dev1 → sqlmesh-0.191.1.dev3}/sqlmesh/core/engine_adapter/mssql.py

@@ -219,6 +219,10 @@ class MSSQLEngineAdapter(
         assert isinstance(df, pd.DataFrame)
         temp_table = self._get_temp_table(target_table or "pandas")
 
+        # Return the superclass implementation if the connection pool doesn't support bulk_copy
+        if not hasattr(self._connection_pool.get(), "bulk_copy"):
+            return super()._df_to_source_queries(df, columns_to_types, batch_size, target_table)
+
         def query_factory() -> Query:
             # It is possible for the factory to be called multiple times and if so then the temp table will already
             # be created so we skip creating again. This means we are assuming the first call is the same result

{sqlmesh-0.191.1.dev1 → sqlmesh-0.191.1.dev3}/sqlmesh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.191.1.dev1
+Version: 0.191.1.dev3
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License
@@ -233,7 +233,7 @@ Requires-Dist: pydantic>=2.0.0
 Requires-Dist: requests
 Requires-Dist: rich[jupyter]
 Requires-Dist: ruamel.yaml
-Requires-Dist: sqlglot[rs]~=26.26.0
+Requires-Dist: sqlglot[rs]~=26.27.0
 Requires-Dist: tenacity
 Requires-Dist: time-machine
 Requires-Dist: json-stream
@@ -241,6 +241,8 @@ Provides-Extra: athena
 Requires-Dist: PyAthena[Pandas]; extra == "athena"
 Provides-Extra: azuresql
 Requires-Dist: pymssql; extra == "azuresql"
+Provides-Extra: azuresql-odbc
+Requires-Dist: pyodbc; extra == "azuresql-odbc"
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery[pandas]; extra == "bigquery"
 Requires-Dist: google-cloud-bigquery-storage; extra == "bigquery"
@@ -311,6 +313,8 @@ Requires-Dist: langchain; extra == "llm"
 Requires-Dist: openai; extra == "llm"
 Provides-Extra: mssql
 Requires-Dist: pymssql; extra == "mssql"
+Provides-Extra: mssql-odbc
+Requires-Dist: pyodbc; extra == "mssql-odbc"
 Provides-Extra: mysql
 Requires-Dist: pymysql; extra == "mysql"
 Provides-Extra: mwaa

{sqlmesh-0.191.1.dev1 → sqlmesh-0.191.1.dev3}/sqlmesh.egg-info/SOURCES.txt

@@ -820,50 +820,50 @@ web/client/tailwind.config.cjs
 web/client/tsconfig.json
 web/client/vite.config.ts
 web/client/dist/index.html
-web/client/dist/assets/Audits-Pgs8N6IE.js
-web/client/dist/assets/Banner-DVsKo_4f.js
-web/client/dist/assets/ChevronDownIcon-nW8Gsfc8.js
-web/client/dist/assets/ChevronRightIcon-dV0VWg50.js
-web/client/dist/assets/Content-C0JdHN-F.js
-web/client/dist/assets/Content-DV3whS9M.js
-web/client/dist/assets/Data-CGN0CnIX.js
-web/client/dist/assets/DataCatalog-dshO8o7W.js
-web/client/dist/assets/Editor-BV_q4XNs.js
-web/client/dist/assets/Editor-UXlx6hNl.js
-web/client/dist/assets/Errors-BZn1A8l3.js
-web/client/dist/assets/FileExplorer-Bc12UBVw.js
-web/client/dist/assets/Footer-BEjDDaSE.js
-web/client/dist/assets/Header-BUnVQQzm.js
-web/client/dist/assets/Input-CYkPiHdu.js
-web/client/dist/assets/Lineage-Bb_XDi8Z.js
-web/client/dist/assets/ListboxShow-BoQTSdAK.js
-web/client/dist/assets/ModelLineage-Bkj5mIkh.js
-web/client/dist/assets/Models-DnL6WJTs.js
-web/client/dist/assets/Page-CGKYDGz-.js
-web/client/dist/assets/Plan-DcGriIiA.js
-web/client/dist/assets/PlusCircleIcon-G0dx9NQm.js
-web/client/dist/assets/ReportErrors-B7Mr6CPy.js
-web/client/dist/assets/Root-B7VWZ_LH.js
-web/client/dist/assets/SearchList-BGwZi6Iv.js
-web/client/dist/assets/SelectEnvironment-Bq5yNhkA.js
-web/client/dist/assets/SourceList-ChD1dovq.js
-web/client/dist/assets/SourceListItem-BSGVpkoq.js
-web/client/dist/assets/SplitPane-3okSokAv.js
-web/client/dist/assets/Tests-itL38hJI.js
-web/client/dist/assets/Welcome-BP7z8PA1.js
+web/client/dist/assets/Audits-Dym5PKHr.js
+web/client/dist/assets/Banner-BeLNhV1V.js
+web/client/dist/assets/ChevronDownIcon-DlnnZjiA.js
+web/client/dist/assets/ChevronRightIcon-NPjpYxnn.js
+web/client/dist/assets/Content-BArLdTPL.js
+web/client/dist/assets/Content-DA4WySs8.js
+web/client/dist/assets/Data-y-N_Uq1L.js
+web/client/dist/assets/DataCatalog-Mvlf_ijD.js
+web/client/dist/assets/Editor-BDYpNxXe.js
+web/client/dist/assets/Editor-B_Eu4-Yv.js
+web/client/dist/assets/Errors-DUEZ6U5r.js
+web/client/dist/assets/FileExplorer-BMMg4WGN.js
+web/client/dist/assets/Footer-BWuRBavm.js
+web/client/dist/assets/Header-BnCvN-7r.js
+web/client/dist/assets/Input-DAYXvlPo.js
+web/client/dist/assets/Lineage-CQy2gjl7.js
+web/client/dist/assets/ListboxShow-CneqBQlG.js
+web/client/dist/assets/ModelLineage-LwVobskP.js
+web/client/dist/assets/Models-ybMoSGAy.js
+web/client/dist/assets/Page-C1ITdiJq.js
+web/client/dist/assets/Plan-CSCHEA-W.js
+web/client/dist/assets/PlusCircleIcon-fYWRjHku.js
+web/client/dist/assets/ReportErrors-BQ_A528A.js
+web/client/dist/assets/Root-x89Lo48v.js
+web/client/dist/assets/SearchList-B9qYyCPy.js
+web/client/dist/assets/SelectEnvironment-3fBvWeru.js
+web/client/dist/assets/SourceList-CFOEK1vr.js
+web/client/dist/assets/SourceListItem-DA5_xyCX.js
+web/client/dist/assets/SplitPane-B78j2dEu.js
+web/client/dist/assets/Tests-P41ilYMc.js
+web/client/dist/assets/Welcome-hiNJ1DDk.js
 web/client/dist/assets/_commonjs-dynamic-modules-TDtrdbi3.js
-web/client/dist/assets/context-D1hHNguh.js
-web/client/dist/assets/context-DxH8yaYv.js
-web/client/dist/assets/editor-CiPjHBto.js
-web/client/dist/assets/file-CafyWkYy.js
-web/client/dist/assets/floating-ui.react-dom-C8DFRCmP.js
+web/client/dist/assets/context-BBu4gIRy.js
+web/client/dist/assets/context-DQtNDhRm.js
+web/client/dist/assets/editor-BC8LxZn5.js
+web/client/dist/assets/file-ugRqly-F.js
+web/client/dist/assets/floating-ui.react-dom-BYz8RJrU.js
 web/client/dist/assets/help-6Q7f7fjd.js
-web/client/dist/assets/help-ClwWI4Vm.js
-web/client/dist/assets/index-Cd9H4oK_.js
-web/client/dist/assets/index-GDI1mjkA.js
-web/client/dist/assets/plan-YZ0KB3_p.js
-web/client/dist/assets/popover-Cy5cZxvQ.js
-web/client/dist/assets/project-BDbQ0VpX.js
+web/client/dist/assets/help-BMdD8bGm.js
+web/client/dist/assets/index-B3LoCbyu.js
+web/client/dist/assets/index-_R_PVUU6.js
+web/client/dist/assets/plan-BxgjbT85.js
+web/client/dist/assets/popover-h8iQeLew.js
+web/client/dist/assets/project-BaeMGMbz.js
 web/client/dist/css/base.css
 web/client/dist/css/design.css
 web/client/dist/favicons/favicon.svg

{sqlmesh-0.191.1.dev1 → sqlmesh-0.191.1.dev3}/sqlmesh.egg-info/requires.txt

@@ -12,7 +12,7 @@ pydantic>=2.0.0
 requests
 rich[jupyter]
 ruamel.yaml
-sqlglot[rs]~=26.26.0
+sqlglot[rs]~=26.27.0
 tenacity
 time-machine
 json-stream
@@ -26,6 +26,9 @@ PyAthena[Pandas]
 [azuresql]
 pymssql
 
+[azuresql-odbc]
+pyodbc
+
 [bigframes]
 bigframes>=1.32.0
 
@@ -116,6 +119,9 @@ lsprotocol
 [mssql]
 pymssql
 
+[mssql-odbc]
+pyodbc
+
 [mwaa]
 boto3