sqlmesh 0.234.1__tar.gz → 0.235.2__tar.gz

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/.github/workflows/pr.yaml

@@ -188,15 +188,15 @@ jobs:
 
   ui-style:
     needs: [changes]
-    if:
-      needs.changes.outputs.client == 'true' || needs.changes.outputs.ci ==
-      'true' || github.ref == 'refs/heads/main'
+    if: false
+      # needs.changes.outputs.client == 'true' || needs.changes.outputs.ci ==
+      # 'true' || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '22'
       - uses: pnpm/action-setup@v4
         with:
           version: latest
@@ -396,6 +396,7 @@ jobs:
     env:
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
     runs-on: ubuntu-latest
+    if: false
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/.github/workflows/release.yaml

@@ -12,12 +12,12 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '22'
       - uses: pnpm/action-setup@v4
         with:
           version: latest
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
       - name: Build UI
         run: pnpm --prefix web/client run build
       - name: Upload UI build artifact

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/.github/workflows/release_extension.yaml

@@ -30,7 +30,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/.github/workflows/release_shared_js.yaml

@@ -33,7 +33,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '22'
           registry-url: 'https://registry.npmjs.org'
       - name: Update npm
         run: npm install -g npm@latest

sqlmesh-0.235.2/.nvmrc

@@ -0,0 +1 @@
+22

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.234.1
+Version: 0.235.2
 Summary: Next-generation data transformation framework
 Author: SQLMesh Contributors
 License:                                  Apache License
@@ -235,7 +235,7 @@ Requires-Dist: python-dotenv
 Requires-Dist: requests
 Requires-Dist: rich[jupyter]
 Requires-Dist: ruamel.yaml
-Requires-Dist: sqlglot~=30.4.2
+Requires-Dist: sqlglot~=30.8.0
 Requires-Dist: tenacity
 Requires-Dist: time-machine
 Requires-Dist: json-stream

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/package.json

@@ -1,6 +1,6 @@
 {
   "engines": {
-    "node": ">=20.0.0",
+    "node": ">=22.0.0",
     "pnpm": ">=10.0.0"
   },
   "scripts": {

sqlmesh-0.235.2/pnpm-workspace.yaml

@@ -0,0 +1,12 @@
+packages:
+  - vscode/bus
+  - vscode/extension
+  - vscode/react
+  - web/client
+  - web/common
+allowBuilds:
+  '@swc/core': true
+  '@tailwindcss/oxide': true
+  '@vscode/vsce-sign': true
+  esbuild: true
+  keytar: true

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
     "requests",
     "rich[jupyter]",
     "ruamel.yaml",
-    "sqlglot~=30.4.2",
+    "sqlglot~=30.8.0",
     "tenacity",
     "time-machine",
     "json-stream"

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/sqlmesh/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.234.1'
-__version_tuple__ = version_tuple = (0, 234, 1)
+__version__ = version = '0.235.2'
+__version_tuple__ = version_tuple = (0, 235, 2)
 
-__commit_id__ = commit_id = 'gda2e5fc03'
+__commit_id__ = commit_id = 'g41d990693'

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/sqlmesh/core/config/connection.py

@@ -814,6 +814,8 @@ class DatabricksConnectionConfig(ConnectionConfig):
     DISPLAY_NAME: t.ClassVar[t.Literal["Databricks"]] = "Databricks"
     DISPLAY_ORDER: t.ClassVar[t.Literal[3]] = 3
 
+    shared_connection: t.ClassVar[bool] = True
+
     _concurrent_tasks_validator = concurrent_tasks_validator
     _http_headers_validator = http_headers_validator
 

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/sqlmesh/core/context.py

@@ -2495,6 +2495,7 @@ class GenericContext(BaseContext, t.Generic[C]):
                 gateway=external_models_gateway,
                 max_workers=self.concurrent_tasks,
                 strict=strict,
+                all_models=self._models,
             )
 
     @python_api_analytics

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/sqlmesh/core/dialect.py

@@ -481,10 +481,14 @@ def _parse_types(
     check_func: bool = False,
     schema: bool = False,
     allow_identifiers: bool = True,
+    with_collation: bool = False,
 ) -> t.Optional[exp.Expr]:
     start = self._curr
     parsed_type = self.__parse_types(  # type: ignore
-        check_func=check_func, schema=schema, allow_identifiers=allow_identifiers
+        check_func=check_func,
+        schema=schema,
+        allow_identifiers=allow_identifiers,
+        with_collation=with_collation,
     )
 
     if schema and parsed_type:

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/sqlmesh/core/macros.py

@@ -15,6 +15,7 @@ import sqlglot
 from sqlglot import Generator, exp, parse_one
 from sqlglot.executor.env import ENV
 from sqlglot.executor.python import Python
+from sqlglot.generators.python import PythonGenerator
 from sqlglot.helper import csv, ensure_collection
 from sqlglot.optimizer.normalize_identifiers import normalize_identifiers
 from sqlglot.schema import MappingSchema
@@ -140,9 +141,9 @@ class CaseInsensitiveMapping(t.Dict[str, t.Any]):
 
 
 class MacroDialect(Python):
-    class Generator(Python.Generator):
+    class Generator(PythonGenerator):
         TRANSFORMS = {
-            **Python.Generator.TRANSFORMS,  # type: ignore
+            **PythonGenerator.TRANSFORMS,
             exp.Column: lambda self, e: f"exp.to_column('{self.sql(e, 'this')}')",
             exp.Lambda: lambda self, e: f"lambda {self.expressions(e)}: {self.sql(e, 'this')}",
             MacroFunc: _macro_func_sql,

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/sqlmesh/core/schema_loader.py

@@ -24,26 +24,31 @@ def create_external_models_file(
     gateway: t.Optional[str] = None,
     max_workers: int = 1,
     strict: bool = False,
+    all_models: t.Optional[t.Dict[str, Model]] = None,
 ) -> None:
     """Create or replace a YAML file with column and types of all columns in all external models.
 
     Args:
         path: The path to store the YAML file.
-        models: FQN to model
+        models: FQN to model for the current repo/config being processed.
         adapter: The engine adapter.
         state_reader: The state reader.
         dialect: The dialect to serialize the schema as.
         gateway: If the model should be associated with a specific gateway; the gateway key
         max_workers: The max concurrent workers to fetch columns.
         strict: If True, raise an error if the external model is missing in the database.
+        all_models: FQN to model across all loaded repos. When provided, a dependency is only
+            classified as external if it is absent from this full set. This prevents cross-repo
+            internal models from being misclassified as external in multi-repo setups.
     """
+    known_models: t.Dict[str, Model] = all_models if all_models is not None else models
     external_model_fqns = set()
 
     for fqn, model in models.items():
         if model.kind.is_external:
             external_model_fqns.add(fqn)
         for dep in model.depends_on:
-            if dep not in models:
+            if dep not in known_models:
                 external_model_fqns.add(dep)
 
     # Make sure we don't convert internal models into external ones.

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/sqlmesh/core/snapshot/evaluator.py

@@ -528,12 +528,27 @@ class SnapshotEvaluator:
         target_snapshots = [
             t for t in target_snapshots if t.snapshot.is_model and not t.snapshot.is_symbolic
         ]
+        available_gateways = set(self.adapters.keys())
+        skipped = []
+        filtered_targets = []
+        for t in target_snapshots:
+            gw = t.snapshot.model_gateway
+            if gw and gw not in available_gateways:
+                skipped.append((t.snapshot.snapshot_id, gw))
+            else:
+                filtered_targets.append(t)
+        if skipped:
+            logger.warning(
+                "Skipping cleanup of %d snapshot(s) with unavailable gateway(s): %s",
+                len(skipped),
+                ", ".join(f"{sid} (gateway={gw})" for sid, gw in skipped),
+            )
         snapshots_to_dev_table_only = {
-            t.snapshot.snapshot_id: t.dev_table_only for t in target_snapshots
+            t.snapshot.snapshot_id: t.dev_table_only for t in filtered_targets
         }
         with self.concurrent_context():
             concurrent_apply_to_snapshots(
-                [t.snapshot for t in target_snapshots],
+                [t.snapshot for t in filtered_targets],
                 lambda s: self._cleanup_snapshot(
                     s,
                     snapshots_to_dev_table_only[s.snapshot_id],

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/sqlmesh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.234.1
+Version: 0.235.2
 Summary: Next-generation data transformation framework
 Author: SQLMesh Contributors
 License:                                  Apache License
@@ -235,7 +235,7 @@ Requires-Dist: python-dotenv
 Requires-Dist: requests
 Requires-Dist: rich[jupyter]
 Requires-Dist: ruamel.yaml
-Requires-Dist: sqlglot~=30.4.2
+Requires-Dist: sqlglot~=30.8.0
 Requires-Dist: tenacity
 Requires-Dist: time-machine
 Requires-Dist: json-stream

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/sqlmesh.egg-info/requires.txt

@@ -14,7 +14,7 @@ python-dotenv
 requests
 rich[jupyter]
 ruamel.yaml
-sqlglot~=30.4.2
+sqlglot~=30.8.0
 tenacity
 time-machine
 json-stream

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/tests/core/integration/test_multi_repo.py

@@ -21,6 +21,7 @@ from sqlmesh.core.config import (
 )
 from sqlmesh.core.console import get_console
 from sqlmesh.core.context import Context
+from sqlmesh.utils import yaml
 from sqlmesh.utils.date import now
 from tests.conftest import DuckDBMetadata
 from tests.utils.test_helpers import use_terminal_console
@@ -559,3 +560,58 @@ def test_engine_adapters_multi_repo_all_gateways_gathered(copy_to_temp_path):
     gathered_gateways = context.engine_adapters.keys()
     expected_gateways = {"local", "memory", "extra"}
     assert gathered_gateways == expected_gateways
+
+
+@use_terminal_console
+def test_multi_repo_create_external_models(copy_to_temp_path):
+    """create_external_models should not classify cross-repo models as external (sqlmesh#5326).
+
+    silver.c and silver.e (repo_2) depend on bronze.a (repo_1). When running
+    create_external_models with both repos loaded, bronze.a must NOT be treated
+    as an external model because it is an internal model defined in repo_1.
+
+    The observable symptom of the bug is a warning: "Unable to get schema for
+    'bronze.a'" — because SQLMesh tries to query the schema of what it wrongly
+    thinks is an external table.  A correct implementation never attempts this
+    lookup and therefore emits no such warning.
+    """
+    paths = copy_to_temp_path("examples/multi")
+    repo_1_path = f"{paths[0]}/repo_1"
+    repo_2_path = f"{paths[0]}/repo_2"
+
+    context = Context(paths=[repo_1_path, repo_2_path], gateway="memory")
+    context._new_state_sync().reset(default_catalog=context.default_catalog)
+
+    with patch.object(context.console, "log_warning") as mock_warning:
+        context.create_external_models()
+
+    warning_messages = [str(call) for call in mock_warning.call_args_list]
+    schema_lookup_warnings = [
+        msg
+        for msg in warning_messages
+        if "bronze" in msg and "a" in msg and "schema" in msg.lower()
+    ]
+    assert not schema_lookup_warnings, (
+        "bronze.a should not be looked up as an external model, but got warnings: "
+        + str(schema_lookup_warnings)
+    )
+
+    # repo_2's external_models.yaml must not contain bronze.a
+    repo_2_external = Path(repo_2_path) / c.EXTERNAL_MODELS_YAML
+    if repo_2_external.exists():
+        contents = yaml.load(repo_2_external)
+        external_names = [e["name"] for e in contents]
+        assert not any("bronze" in name and "a" in name for name in external_names), (
+            f"bronze.a should not be in repo_2's external models, but found: {external_names}"
+        )
+
+    # repo_1 has no external dependencies at all
+    repo_1_external = Path(repo_1_path) / c.EXTERNAL_MODELS_YAML
+    if repo_1_external.exists():
+        contents = yaml.load(repo_1_external)
+        assert len(contents) == 0, f"repo_1 should have no external models, got: {contents}"
+
+    # Plan should still resolve all 5 models as internal after create_external_models
+    context.load()
+    plan = context.plan_builder().build()
+    assert len(plan.new_snapshots) == 5

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/tests/core/test_connection_config.py

@@ -1422,6 +1422,35 @@ def test_databricks(make_config):
         )
 
 
+def test_databricks_shared_connection(make_config):
+    """Databricks should use a shared connection pool to prevent OAuth CSRF races.
+
+    When concurrent_tasks > 1, ThreadLocalConnectionPool creates one connection per
+    thread. For U2M OAuth, each thread triggers its own browser-based OAuth flow;
+    these race on the CSRF state parameter and cause MismatchingStateError.
+
+    Setting shared_connection = True causes ThreadLocalSharedConnectionPool to be
+    used instead: a single connection is created (behind a lock) and each thread
+    gets its own cursor, so only one OAuth flow is ever initiated.
+
+    See: https://github.com/tobymao/sqlmesh/issues/5646
+    """
+    from sqlmesh.utils.connection_pool import ThreadLocalSharedConnectionPool
+
+    config = make_config(
+        type="databricks",
+        server_hostname="dbc-test.cloud.databricks.com",
+        http_path="sql/test/foo",
+        access_token="test-token",
+        concurrent_tasks=4,
+    )
+    assert isinstance(config, DatabricksConnectionConfig)
+    assert config.shared_connection is True
+
+    adapter = config.create_engine_adapter()
+    assert isinstance(adapter._connection_pool, ThreadLocalSharedConnectionPool)
+
+
 def test_engine_import_validator():
     with pytest.raises(
         ConfigError,

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/tests/core/test_snapshot_evaluator.py

@@ -4503,6 +4503,41 @@ def test_multiple_engine_cleanup(snapshot: Snapshot, adapters, make_snapshot):
     )
 
 
+def test_cleanup_skips_unavailable_gateway(snapshot: Snapshot, adapters, make_snapshot):
+    engine_adapters = {"default": adapters[0]}
+    evaluator = SnapshotEvaluator(engine_adapters)
+
+    model_with_missing_gw = load_sql_based_model(
+        parse(  # type: ignore
+            """
+            MODEL (
+                name test_schema.test_model,
+                kind FULL,
+                gateway nonexistent_gateway,
+            );
+            SELECT a::int FROM tbl;
+            """
+        ),
+    )
+
+    snapshot_missing_gw = make_snapshot(model_with_missing_gw)
+    snapshot.categorize_as(SnapshotChangeCategory.BREAKING)
+    snapshot_missing_gw.categorize_as(SnapshotChangeCategory.BREAKING)
+
+    evaluator.create([snapshot], {}, DeployabilityIndex.all_deployable())
+
+    evaluator.cleanup(
+        [
+            SnapshotTableCleanupTask(snapshot=snapshot.table_info, dev_table_only=True),
+            SnapshotTableCleanupTask(snapshot=snapshot_missing_gw.table_info, dev_table_only=True),
+        ],
+    )
+
+    engine_adapters["default"].drop_table.assert_called_once_with(
+        f"sqlmesh__db.db__model__{snapshot.version}__dev", cascade=True
+    )
+
+
 def test_multi_engine_python_model_with_macros(adapters, make_snapshot):
     engine_adapters = {"default": adapters[0], "secondary": adapters[1]}
     evaluator = SnapshotEvaluator(engine_adapters)

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/vscode/bus/src/callbacks.ts

@@ -4,7 +4,7 @@ export type CallbackShape = Record<string, any>
 
 export type Callback = {
   openFile: {
-    uri: string
+    filePath: string
   }
   rpcResponse: RPCResponse
 } & CallbackShape

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/vscode/extension/src/commands/tableDiff.ts

@@ -271,7 +271,7 @@ export function showTableDiff(
             if (workspaceFolders.length != 1) {
               throw new Error('Only one workspace folder is supported')
             }
-            const fullPath = vscode.Uri.parse(message.payload.uri)
+            const fullPath = vscode.Uri.file(message.payload.filePath)
             const document = await vscode.workspace.openTextDocument(fullPath)
             await vscode.window.showTextDocument(document)
             break

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/vscode/extension/src/webviews/lineagePanel.ts

@@ -47,7 +47,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
             key: 'vscode_send',
             payload: {
               key: 'changeFocusOnFile',
-              payload: { path: editor.document.uri.toString() },
+              payload: { path: editor.document.uri.fsPath },
             },
           })
         }
@@ -84,7 +84,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
             if (workspaceFolders.length != 1) {
               throw new Error('Only one workspace folder is supported')
             }
-            const fullPath = Uri.parse(message.payload.uri)
+            const fullPath = Uri.file(message.payload.filePath)
             const document = await workspace.openTextDocument(fullPath)
             await window.showTextDocument(document)
             break

{sqlmesh-0.234.1 → sqlmesh-0.235.2}/vscode/react/src/pages/lineage.tsx

@@ -13,7 +13,6 @@ import React, { useState } from 'react'
 import { ModelSQLMeshModel } from '@/domain/sqlmesh-model'
 import { useEventBus } from '@/hooks/eventBus'
 import type { VSCodeEvent } from '@bus/callbacks'
-import { URI } from 'vscode-uri'
 import type { Model } from '@/api/client'
 import { useRpc } from '@/utils/rpc'
 import {
@@ -98,13 +97,12 @@ function Lineage() {
         return models[0].name
       }
       // @ts-ignore
-      const fileUri: string = activeFile.fileUri
-      const filePath = URI.file(fileUri).path
+      const filePath: string = activeFile.fileUri
       const model = models.find((m: Model) => {
         if (!m.full_path) {
           return false
         }
-        return URI.file(m.full_path).path === filePath
+        return m.full_path === filePath
       })
       if (model) {
         return model.name
@@ -134,9 +132,8 @@ function Lineage() {
 
   React.useEffect(() => {
     const handleChangeFocusedFile = (fileUri: { fileUri: string }) => {
-      const full_path = URI.parse(fileUri.fileUri).path
       const model = Object.values(modelsRecord).find(
-        m => URI.file(m.full_path).path === full_path,
+        m => m.full_path === fileUri.fileUri,
       )
       if (model) {
         setSelectedModel(model.name)
@@ -201,7 +198,7 @@ export function LineageComponentFromWeb({
     if (!model.full_path) {
       return
     }
-    vscode('openFile', { uri: URI.file(model.full_path).toString() })
+    vscode('openFile', { filePath: model.full_path })
   }
 
   function handleError(error: any): void {

sqlmesh-0.234.1/.nvmrc

@@ -1 +0,0 @@
-20

sqlmesh-0.234.1/pnpm-workspace.yaml

@@ -1,6 +0,0 @@
-packages:
-  - vscode/bus
-  - vscode/extension
-  - vscode/react
-  - web/client
-  - web/common