sqlmesh 0.232.0__tar.gz → 0.233.0__tar.gz

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.232.0
+Version: 0.233.0
 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.0.1
+Requires-Dist: sqlglot~=30.2.1
 Requires-Dist: tenacity
 Requires-Dist: time-machine
 Requires-Dist: json-stream

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/pyproject.toml

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

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.232.0'
-__version_tuple__ = version_tuple = (0, 232, 0)
+__version__ = version = '0.233.0'
+__version_tuple__ = version_tuple = (0, 233, 0)
 
-__commit_id__ = commit_id = 'g8f092acda'
+__commit_id__ = commit_id = 'g41a9d297d'

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/core/config/connection.py

@@ -2341,23 +2341,20 @@ class RisingwaveConnectionConfig(ConnectionConfig):
         return init
 
 
+_CONNECTION_CONFIG_EXCLUDE: t.Set[t.Type[ConnectionConfig]] = {
+    ConnectionConfig,  # type: ignore[type-abstract]
+    BaseDuckDBConnectionConfig,  # type: ignore[type-abstract]
+}
+
 CONNECTION_CONFIG_TO_TYPE = {
     # Map all subclasses of ConnectionConfig to the value of their `type_` field.
     tpe.all_field_infos()["type_"].default: tpe
-    for tpe in subclasses(
-        __name__,
-        ConnectionConfig,
-        exclude={ConnectionConfig, BaseDuckDBConnectionConfig},
-    )
+    for tpe in subclasses(__name__, ConnectionConfig, exclude=_CONNECTION_CONFIG_EXCLUDE)
 }
 
 DIALECT_TO_TYPE = {
     tpe.all_field_infos()["type_"].default: tpe.DIALECT
-    for tpe in subclasses(
-        __name__,
-        ConnectionConfig,
-        exclude={ConnectionConfig, BaseDuckDBConnectionConfig},
-    )
+    for tpe in subclasses(__name__, ConnectionConfig, exclude=_CONNECTION_CONFIG_EXCLUDE)
 }
 
 INIT_DISPLAY_INFO_TO_TYPE = {
@@ -2365,11 +2362,7 @@ INIT_DISPLAY_INFO_TO_TYPE = {
         tpe.DISPLAY_ORDER,
         tpe.DISPLAY_NAME,
     )
-    for tpe in subclasses(
-        __name__,
-        ConnectionConfig,
-        exclude={ConnectionConfig, BaseDuckDBConnectionConfig},
-    )
+    for tpe in subclasses(__name__, ConnectionConfig, exclude=_CONNECTION_CONFIG_EXCLUDE)
 }
 
 

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/core/config/scheduler.py

@@ -144,9 +144,10 @@ class BuiltInSchedulerConfig(_EngineAdapterStateSyncSchedulerConfig, BaseConfig)
         return default_catalogs_per_gateway
 
 
-SCHEDULER_CONFIG_TO_TYPE = {
+SCHEDULER_CONFIG_TO_TYPE: t.Dict[str, t.Type[SchedulerConfig]] = {
     tpe.all_field_infos()["type_"].default: tpe
     for tpe in subclasses(__name__, BaseConfig, exclude={BaseConfig})
+    if issubclass(tpe, SchedulerConfig)
 }
 
 

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/core/dialect.py

@@ -14,6 +14,7 @@ from sqlglot import Dialect, Generator, ParseError, Parser, Tokenizer, TokenType
 from sqlglot.dialects.dialect import DialectType
 from sqlglot.dialects import DuckDB, Snowflake, TSQL
 import sqlglot.dialects.athena as athena
+import sqlglot.generators.athena as athena_generators
 from sqlglot.parsers.athena import AthenaTrinoParser
 from sqlglot.helper import seq_get
 from sqlglot.optimizer.normalize_identifiers import normalize_identifiers
@@ -1048,8 +1049,8 @@ def extend_sqlglot() -> None:
         if dialect == athena.Athena:
             tokenizers.add(athena._TrinoTokenizer)
             parsers.add(AthenaTrinoParser)
-            generators.add(athena._TrinoGenerator)
-            generators.add(athena._HiveGenerator)
+            generators.add(athena_generators.AthenaTrinoGenerator)
+            generators.add(athena_generators._HiveGenerator)
 
         if hasattr(dialect, "Tokenizer"):
             tokenizers.add(dialect.Tokenizer)

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/core/linter/rules/builtin.py

@@ -318,4 +318,5 @@ class NoAmbiguousProjections(Rule):
         return None
 
 
-BUILTIN_RULES = RuleSet(subclasses(__name__, Rule, exclude={Rule}))
+_RULE_EXCLUDE: t.Set[t.Type[Rule]] = {Rule}  # type: ignore[type-abstract]
+BUILTIN_RULES = RuleSet(subclasses(__name__, Rule, exclude=_RULE_EXCLUDE))

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/core/loader.py

@@ -840,7 +840,8 @@ class SqlMeshLoader(Loader):
             if os.path.getsize(path):
                 self._track_file(path)
                 module = import_python_file(path, self.config_path)
-                module_rules = subclasses(module.__name__, Rule, exclude={Rule})
+                _rule_exclude: t.Set[t.Type[Rule]] = {Rule}  # type: ignore[type-abstract]
+                module_rules = subclasses(module.__name__, Rule, exclude=_rule_exclude)
                 for user_rule in module_rules:
                     user_rules[user_rule.name] = user_rule
 

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/core/macros.py

@@ -294,7 +294,9 @@ class MacroEvaluator:
             return node
 
         transformed = exp.replace_tree(
-            expression.copy(), evaluate_macros, prune=lambda n: isinstance(n, exp.Lambda)
+            expression.copy(),
+            evaluate_macros,  # type: ignore[arg-type]
+            prune=lambda n: isinstance(n, exp.Lambda),
         )
 
         if changed:

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/core/model/definition.py

@@ -2065,7 +2065,9 @@ def create_models_from_blueprints(
     **loader_kwargs: t.Any,
 ) -> t.List[Model]:
     model_blueprints: t.List[Model] = []
+    original_default_catalog = loader_kwargs.get("default_catalog")
     for blueprint in _extract_blueprints(blueprints, path):
+        loader_kwargs["default_catalog"] = original_default_catalog
         blueprint_variables = _extract_blueprint_variables(blueprint, path)
 
         if gateway:
@@ -2083,12 +2085,15 @@ def create_models_from_blueprints(
         else:
             gateway_name = None
 
-        if (
-            default_catalog_per_gateway
-            and gateway_name
-            and (catalog := default_catalog_per_gateway.get(gateway_name)) is not None
-        ):
-            loader_kwargs["default_catalog"] = catalog
+        if default_catalog_per_gateway and gateway_name:
+            catalog = default_catalog_per_gateway.get(gateway_name)
+            if catalog is not None:
+                loader_kwargs["default_catalog"] = catalog
+            else:
+                # Gateway exists but has no entry in the dict (e.g., catalog-unsupported
+                # engines like ClickHouse). Clear the default catalog so the global
+                # default from the primary gateway doesn't leak into this model's name.
+                loader_kwargs["default_catalog"] = None
 
         model_blueprints.append(
             loader(

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/core/renderer.py

@@ -331,7 +331,7 @@ class BaseExpressionRenderer:
         deployability_index: t.Optional[DeployabilityIndex] = None,
     ) -> exp.Table:
         table = exp.replace_tables(
-            exp.maybe_parse(table_name, into=exp.Table, dialect=self._dialect),
+            t.cast(exp.Table, exp.maybe_parse(table_name, into=exp.Table, dialect=self._dialect)),
             {
                 **self._to_table_mapping((snapshots or {}).values(), deployability_index),
                 **(table_mapping or {}),

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/core/table_diff.py

@@ -255,12 +255,13 @@ class TableDiff:
         self.source_alias = source_alias
         self.target_alias = target_alias
 
+        cols: t.List[str] = ensure_list(skip_columns)
         self.skip_columns = {
             normalize_identifiers(
-                exp.parse_identifier(t.cast(str, col)),
+                exp.parse_identifier(col),
                 dialect=self.model_dialect or self.dialect,
             ).name
-            for col in ensure_list(skip_columns)
+            for col in cols
         }
 
         self._on = on

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/core/test/definition.py

@@ -612,20 +612,27 @@ class ModelTest(unittest.TestCase):
         - Globally patch the SQLGlot dialect so that any date/time nodes are evaluated at the `execution_time` during generation
         """
         import time_machine
+        from sqlglot.generator import _DISPATCH_CACHE
 
         lock_ctx: AbstractContextManager = (
             self.CONCURRENT_RENDER_LOCK if self.concurrency else nullcontext()
         )
         time_ctx: AbstractContextManager = nullcontext()
         dialect_patch_ctx: AbstractContextManager = nullcontext()
+        dispatch_patch_ctx: AbstractContextManager = nullcontext()
 
         if self._execution_time:
+            generator_class = self._test_adapter_dialect.generator_class
             time_ctx = time_machine.travel(self._execution_time, tick=False)
-            dialect_patch_ctx = patch.dict(
-                self._test_adapter_dialect.generator_class.TRANSFORMS, self._transforms
-            )
+            dialect_patch_ctx = patch.dict(generator_class.TRANSFORMS, self._transforms)
+
+            # sqlglot caches a dispatch table per generator class, so we need to patch
+            # it as well to ensure the overridden transforms are actually used
+            dispatch = _DISPATCH_CACHE.get(generator_class)
+            if dispatch is not None:
+                dispatch_patch_ctx = patch.dict(dispatch, self._transforms)
 
-        with lock_ctx, time_ctx, dialect_patch_ctx:
+        with lock_ctx, time_ctx, dialect_patch_ctx, dispatch_patch_ctx:
             yield
 
     def _execute(self, query: exp.Query | str) -> pd.DataFrame:

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/dbt/manifest.py

@@ -846,7 +846,8 @@ def _build_test_name(node: ManifestNode, dependencies: Dependencies) -> str:
             continue
         if isinstance(val, dict):
             val = list(val.values())
-        val = [re.sub("[^0-9a-zA-Z_]+", "_", str(v)) for v in ensure_list(val)]
+        items: t.List[t.Any] = ensure_list(val)
+        val = [re.sub("[^0-9a-zA-Z_]+", "_", str(v)) for v in items]
         arg_val_parts.extend(val)
     unique_args = "__".join(arg_val_parts) if arg_val_parts else ""
     unique_args = f"_{unique_args}" if unique_args else ""

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh/utils/pydantic.py

@@ -265,9 +265,10 @@ def _get_fields(
     elif isinstance(v, exp.Expr):
         expressions = [v]
     else:
+        items: t.List[t.Any] = ensure_list(v)
         expressions = [
             parse_one(entry, dialect=dialect) if isinstance(entry, str) else entry  # type: ignore[misc]
-            for entry in ensure_list(v)
+            for entry in items
         ]
 
     results = []

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.232.0
+Version: 0.233.0
 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.0.1
+Requires-Dist: sqlglot~=30.2.1
 Requires-Dist: tenacity
 Requires-Dist: time-machine
 Requires-Dist: json-stream

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh.egg-info/SOURCES.txt

@@ -945,50 +945,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-CBiYyyx-.js
-web/client/dist/assets/Banner-DSRbUlO5.js
-web/client/dist/assets/ChevronDownIcon-MK_nrjD_.js
-web/client/dist/assets/ChevronRightIcon-CLWtT22Q.js
-web/client/dist/assets/Content-BNuGZN5l.js
-web/client/dist/assets/Content-CSHJyW0n.js
-web/client/dist/assets/Data-C1oRDbLx.js
-web/client/dist/assets/DataCatalog-HXyX2-_j.js
-web/client/dist/assets/Editor-BDyfpUuw.js
-web/client/dist/assets/Editor-D0jNItwC.js
-web/client/dist/assets/Errors-BfuFLcPi.js
-web/client/dist/assets/FileExplorer-BR9IE3he.js
-web/client/dist/assets/Footer-CgBEtiAh.js
-web/client/dist/assets/Header-DSqR6nSO.js
-web/client/dist/assets/Input-B-oZ6fGO.js
-web/client/dist/assets/Lineage-DYQVwDbD.js
-web/client/dist/assets/ListboxShow-BE5-xevs.js
-web/client/dist/assets/ModelLineage-DkIFAYo4.js
-web/client/dist/assets/Models-D5dWr8RB.js
-web/client/dist/assets/Page-C-XfU5BR.js
-web/client/dist/assets/Plan-ZEuTINBq.js
-web/client/dist/assets/PlusCircleIcon-DVXAHG8_.js
-web/client/dist/assets/ReportErrors-B7FEPzMB.js
-web/client/dist/assets/Root-8aZyhPxF.js
-web/client/dist/assets/SearchList-W_iT2G82.js
-web/client/dist/assets/SelectEnvironment-C65jALmO.js
-web/client/dist/assets/SourceList-DSLO6nVJ.js
-web/client/dist/assets/SourceListItem-BHt8d9-I.js
-web/client/dist/assets/SplitPane-CViaZmw6.js
-web/client/dist/assets/Tests-DhaVt5t1.js
-web/client/dist/assets/Welcome-DvpjH-_4.js
+web/client/dist/assets/Audits-BRXnTDAA.js
+web/client/dist/assets/Banner-DEFcYP66.js
+web/client/dist/assets/ChevronDownIcon-CpX-qVKF.js
+web/client/dist/assets/ChevronRightIcon-BIM_Whvm.js
+web/client/dist/assets/Content-DHG1PWkJ.js
+web/client/dist/assets/Content-Xeiea39u.js
+web/client/dist/assets/Data-DrNGsvAi.js
+web/client/dist/assets/DataCatalog-wCrwPwp0.js
+web/client/dist/assets/Editor-5aFPj8Gu.js
+web/client/dist/assets/Editor-iwkuKugk.js
+web/client/dist/assets/Errors-CRwh9jbo.js
+web/client/dist/assets/FileExplorer-asxyYd0y.js
+web/client/dist/assets/Footer-DfhpOTeP.js
+web/client/dist/assets/Header-gbdKwi40.js
+web/client/dist/assets/Input-DCxZV8fw.js
+web/client/dist/assets/Lineage-POlpdsIU.js
+web/client/dist/assets/ListboxShow-D39rUDEb.js
+web/client/dist/assets/ModelLineage-Z_T2BvWP.js
+web/client/dist/assets/Models-CO9gRp_J.js
+web/client/dist/assets/Page-DAcAYycd.js
+web/client/dist/assets/Plan-CBZF_jh2.js
+web/client/dist/assets/PlusCircleIcon-FPITUshW.js
+web/client/dist/assets/ReportErrors-CIRi8y6o.js
+web/client/dist/assets/Root-CZ27NZBg.js
+web/client/dist/assets/SearchList-CVUOQi3R.js
+web/client/dist/assets/SelectEnvironment-KpcgCJbg.js
+web/client/dist/assets/SourceList-CLGOzxMp.js
+web/client/dist/assets/SourceListItem-Dt8zxlUO.js
+web/client/dist/assets/SplitPane-DUYIuJLF.js
+web/client/dist/assets/Tests-CpXA8ntt.js
+web/client/dist/assets/Welcome-ClVKgXP0.js
 web/client/dist/assets/_commonjs-dynamic-modules-TDtrdbi3.js
-web/client/dist/assets/context-BctCsyGb.js
-web/client/dist/assets/context-DFNeGsFF.js
-web/client/dist/assets/editor-CcO28cqd.js
-web/client/dist/assets/file-CvJN3aZO.js
-web/client/dist/assets/floating-ui.react-dom-CjE-JNW1.js
+web/client/dist/assets/context-BisZDLE-.js
+web/client/dist/assets/context-CmaDWxAn.js
+web/client/dist/assets/editor-2wsJ4SUA.js
+web/client/dist/assets/file-MFokzkr1.js
+web/client/dist/assets/floating-ui.react-dom-BV53-JOI.js
 web/client/dist/assets/help-B59vE3aE.js
-web/client/dist/assets/help-DuPhjipa.js
-web/client/dist/assets/index-C-dJH7yZ.js
-web/client/dist/assets/index-Dj0i1-CA.js
-web/client/dist/assets/plan-BTRSbjKn.js
-web/client/dist/assets/popover-_Sf0yvOI.js
-web/client/dist/assets/project-BvSOI8MY.js
+web/client/dist/assets/help-DK_DQqJC.js
+web/client/dist/assets/index-BXLjZsq1.js
+web/client/dist/assets/index-C64XJl9t.js
+web/client/dist/assets/plan-BcglXxSW.js
+web/client/dist/assets/popover-CoYYPjEO.js
+web/client/dist/assets/project-B5HnGpnZ.js
 web/client/dist/css/base.css
 web/client/dist/css/design.css
 web/client/dist/favicons/favicon.svg

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/sqlmesh.egg-info/requires.txt

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

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/tests/conftest.py

@@ -571,7 +571,7 @@ def copy_to_temp_path(tmp_path: Path) -> t.Callable:
         return [name for name in names if name == ".cache"]
 
     def _make_function(
-        paths: t.Union[t.Union[str, Path], t.Collection[t.Union[str, Path]]],
+        paths: t.Union[str, Path, t.List[t.Union[str, Path]], t.Tuple[t.Union[str, Path], ...]],
     ) -> t.List[Path]:
         paths = ensure_list(paths)
         all_paths = [Path(p) for p in paths]

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/tests/core/test_model.py

@@ -12342,3 +12342,170 @@ def test_audits_in_embedded_model():
     )
     with pytest.raises(ConfigError, match="Audits are not supported for embedded models"):
         load_sql_based_model(expression).validate_definition()
+
+
+def test_default_catalog_not_leaked_to_unsupported_gateway():
+    """
+    Regression test for https://github.com/SQLMesh/sqlmesh/issues/5748
+
+    When a model targets a gateway that is NOT in default_catalog_per_gateway,
+    the global default_catalog should be cleared (set to None) instead of
+    leaking through from the default gateway.
+    """
+    from sqlglot import parse
+
+    expressions = parse(
+        """
+        MODEL (
+            name my_schema.my_model,
+            kind FULL,
+            gateway clickhouse_gw,
+            dialect clickhouse,
+        );
+
+        SELECT 1 AS id
+        """,
+        read="clickhouse",
+    )
+
+    default_catalog_per_gateway = {
+        "default_gw": "example_catalog",
+    }
+
+    models = load_sql_based_models(
+        expressions,
+        get_variables=lambda gw: {},
+        dialect="clickhouse",
+        default_catalog_per_gateway=default_catalog_per_gateway,
+        default_catalog="example_catalog",
+    )
+
+    assert len(models) == 1
+    model = models[0]
+
+    assert not model.catalog, (
+        f"Default gateway catalog leaked into catalog-unsupported gateway model. "
+        f"Expected no catalog, got: {model.catalog}"
+    )
+    assert "example_catalog" not in model.fqn, (
+        f"Default gateway catalog found in model FQN: {model.fqn}"
+    )
+
+
+def test_default_catalog_still_applied_to_supported_gateway():
+    """
+    Control test: when a model targets a gateway that IS in default_catalog_per_gateway,
+    the catalog should still be correctly applied.
+    """
+    from sqlglot import parse
+
+    expressions = parse(
+        """
+        MODEL (
+            name my_schema.my_model,
+            kind FULL,
+            gateway other_duckdb,
+        );
+
+        SELECT 1 AS id
+        """,
+        read="duckdb",
+    )
+
+    default_catalog_per_gateway = {
+        "default_gw": "example_catalog",
+        "other_duckdb": "other_db",
+    }
+
+    models = load_sql_based_models(
+        expressions,
+        get_variables=lambda gw: {},
+        dialect="duckdb",
+        default_catalog_per_gateway=default_catalog_per_gateway,
+        default_catalog="example_catalog",
+    )
+
+    assert len(models) == 1
+    model = models[0]
+
+    assert model.catalog == "other_db", f"Expected catalog 'other_db', got: {model.catalog}"
+
+
+def test_no_gateway_uses_global_default_catalog():
+    """
+    Control test: when a model does NOT specify a gateway, the global
+    default_catalog should still be applied as before.
+    """
+    from sqlglot import parse
+
+    expressions = parse(
+        """
+        MODEL (
+            name my_schema.my_model,
+            kind FULL,
+        );
+
+        SELECT 1 AS id
+        """,
+        read="duckdb",
+    )
+
+    model = load_sql_based_model(
+        expressions,
+        default_catalog="example_catalog",
+        dialect="duckdb",
+    )
+
+    assert model.catalog == "example_catalog"
+
+
+def test_blueprint_catalog_not_cross_contaminated():
+    """
+    When blueprints iterate over different gateways, the catalog from one
+    blueprint iteration should not leak into the next. A ClickHouse blueprint
+    setting default_catalog to None should not prevent the following blueprint
+    from getting its correct catalog.
+    """
+    from sqlglot import parse
+
+    expressions = parse(
+        """
+        MODEL (
+            name @{blueprint}.my_model,
+            kind FULL,
+            gateway @{gw},
+            blueprints (
+                (blueprint := ch_schema, gw := clickhouse_gw),
+                (blueprint := db_schema, gw := default_gw),
+            ),
+        );
+
+        SELECT 1 AS id
+        """,
+        read="duckdb",
+    )
+
+    default_catalog_per_gateway = {
+        "default_gw": "example_catalog",
+    }
+
+    models = load_sql_based_models(
+        expressions,
+        get_variables=lambda gw: {},
+        dialect="duckdb",
+        default_catalog_per_gateway=default_catalog_per_gateway,
+        default_catalog="example_catalog",
+    )
+
+    assert len(models) == 2
+
+    ch_model = next(m for m in models if "ch_schema" in m.fqn)
+    db_model = next(m for m in models if "db_schema" in m.fqn)
+
+    assert not ch_model.catalog, (
+        f"Catalog leaked into ClickHouse blueprint. Got: {ch_model.catalog}"
+    )
+
+    assert db_model.catalog == "example_catalog", (
+        f"Catalog lost for DuckDB blueprint after ClickHouse iteration. Got: {db_model.catalog}"
+    )

{sqlmesh-0.232.0 → sqlmesh-0.233.0}/tests/dbt/test_config.py

@@ -151,7 +151,7 @@ def test_model_to_sqlmesh_fields(dbt_dummy_postgres_config: PostgresConfig):
     assert kind.on_additive_change == OnAdditiveChange.ALLOW
     assert (
         kind.merge_filter.sql(dialect=model.dialect)  # type: ignore
-        == """55 > "__MERGE_SOURCE__"."b" AND "__MERGE_TARGET__"."session_start" > CURRENT_DATE + INTERVAL '7'"""
+        == """55 > "__MERGE_SOURCE__"."b" AND "__MERGE_TARGET__"."session_start" > CURRENT_DATE + INTERVAL '7 DAY'"""
     )
 
     model = model_config.update_with({"dialect": "snowflake"}).to_sqlmesh(context)

sqlmesh-0.232.0/web/client/dist/assets/Audits-CBiYyyx-.js → sqlmesh-0.233.0/web/client/dist/assets/Audits-BRXnTDAA.js

@@ -1 +1 @@
-import{x as n,j as s,O as f,e as t,H as c,B as p,m as x,l as d}from"./index-Dj0i1-CA.js";import{P as j}from"./Page-C-XfU5BR.js";import{u as h}from"./project-BvSOI8MY.js";import{S as v}from"./SourceList-DSLO6nVJ.js";import{S as A}from"./SourceListItem-BHt8d9-I.js";import"./SplitPane-CViaZmw6.js";import"./file-CvJN3aZO.js";import"./Input-B-oZ6fGO.js";import"./floating-ui.react-dom-CjE-JNW1.js";import"./index-C-dJH7yZ.js";function k(){const{pathname:a}=n(),i=h(e=>e.files),r=Array.from(i.values()).filter(e=>e.path.endsWith("audits"));return s.jsx(j,{sidebar:s.jsxs("div",{className:"flex flex-col w-full h-full",children:[s.jsx(v,{keyId:"basename",keyName:"basename",to:t.Audits,items:r,isActive:e=>`${t.Audits}/${e}`===a,className:"h-full",listItem:({to:e,name:o,description:m,text:l,disabled:u=!1})=>s.jsx(A,{to:e,name:o,text:l,description:m,disabled:u})}),s.jsx(c,{}),s.jsx("div",{className:"py-1 px-1 flex justify-end",children:s.jsx(p,{size:d.sm,variant:x.Neutral,children:"Run All"})})]}),content:s.jsx(f,{})})}export{k as default};
+import{x as n,j as s,O as f,e as t,H as c,B as p,m as x,l as d}from"./index-BXLjZsq1.js";import{P as j}from"./Page-DAcAYycd.js";import{u as h}from"./project-B5HnGpnZ.js";import{S as v}from"./SourceList-CLGOzxMp.js";import{S as A}from"./SourceListItem-Dt8zxlUO.js";import"./SplitPane-DUYIuJLF.js";import"./file-MFokzkr1.js";import"./Input-DCxZV8fw.js";import"./floating-ui.react-dom-BV53-JOI.js";import"./index-C64XJl9t.js";function k(){const{pathname:a}=n(),i=h(e=>e.files),r=Array.from(i.values()).filter(e=>e.path.endsWith("audits"));return s.jsx(j,{sidebar:s.jsxs("div",{className:"flex flex-col w-full h-full",children:[s.jsx(v,{keyId:"basename",keyName:"basename",to:t.Audits,items:r,isActive:e=>`${t.Audits}/${e}`===a,className:"h-full",listItem:({to:e,name:o,description:m,text:l,disabled:u=!1})=>s.jsx(A,{to:e,name:o,text:l,description:m,disabled:u})}),s.jsx(c,{}),s.jsx("div",{className:"py-1 px-1 flex justify-end",children:s.jsx(p,{size:d.sm,variant:x.Neutral,children:"Run All"})})]}),content:s.jsx(f,{})})}export{k as default};

sqlmesh-0.232.0/web/client/dist/assets/Banner-DSRbUlO5.js → sqlmesh-0.233.0/web/client/dist/assets/Banner-DEFcYP66.js

@@ -1 +1 @@
-import{j as s,c as i,l as a,m as n,H as p}from"./index-Dj0i1-CA.js";function l({variant:t=n.Neutral,size:e=a.md,isFull:r=!1,isCenter:u=!1,hasBackground:x=!0,hasBackgroundOnHover:f=!1,hasBorder:c=!1,children:m,className:b}){return s.jsx("div",{className:i("w-full text-sm px-4 overflow-hidden rounded-lg",e===a.sm&&"py-2",e===a.md&&"py-4",e===a.lg&&"py-6",r&&"h-full",u&&"justify-center items-center",c&&"border-2",w(t,x,f),b),children:m})}function g({className:t}){return s.jsx(p,{className:i("mx-4 w-full",t)})}function d({children:t,className:e}){return s.jsx("h4",{className:i("font-bold text-sm whitespace-nowrap text-left",e),children:t})}function o({children:t,className:e}){return s.jsx("p",{className:i("text-neutral-600",e),children:t})}l.Label=d;l.Description=o;l.Divider=g;function w(t,e=!0,r=!1){switch(t){case n.Primary:return[r?"hover:bg-primary-5":"",e?"bg-primary-5":"","text-primary-600 dark:text-primary-400"];case n.Success:return[r?"hover:bg-success-5":"",e?"bg-success-5":"","text-success-600 dark:text-success-400"];case n.Warning:return[r?"hover:bg-warning-5":"",e?"bg-warning-5":"","text-warning-600 dark:text-warning-400"];case n.Danger:return[r?"hover:bg-danger-5":"",e?"bg-danger-5":"","text-danger-600 dark:text-danger-400"];case n.Info:return[r?"hover:bg-info-5":"",e?"bg-info-5":"","text-info-600 dark:text-info-400"];case n.Neutral:return[r?"hover:bg-neutral-5":"",e?"bg-neutral-5":"","text-neutral-600 dark:text-neutral-400"];default:return["bg-transparent","text-neutral-600 dark:text-neutral-400"]}}export{l as B};
+import{j as s,c as i,l as a,m as n,H as p}from"./index-BXLjZsq1.js";function l({variant:t=n.Neutral,size:e=a.md,isFull:r=!1,isCenter:u=!1,hasBackground:x=!0,hasBackgroundOnHover:f=!1,hasBorder:c=!1,children:m,className:b}){return s.jsx("div",{className:i("w-full text-sm px-4 overflow-hidden rounded-lg",e===a.sm&&"py-2",e===a.md&&"py-4",e===a.lg&&"py-6",r&&"h-full",u&&"justify-center items-center",c&&"border-2",w(t,x,f),b),children:m})}function g({className:t}){return s.jsx(p,{className:i("mx-4 w-full",t)})}function d({children:t,className:e}){return s.jsx("h4",{className:i("font-bold text-sm whitespace-nowrap text-left",e),children:t})}function o({children:t,className:e}){return s.jsx("p",{className:i("text-neutral-600",e),children:t})}l.Label=d;l.Description=o;l.Divider=g;function w(t,e=!0,r=!1){switch(t){case n.Primary:return[r?"hover:bg-primary-5":"",e?"bg-primary-5":"","text-primary-600 dark:text-primary-400"];case n.Success:return[r?"hover:bg-success-5":"",e?"bg-success-5":"","text-success-600 dark:text-success-400"];case n.Warning:return[r?"hover:bg-warning-5":"",e?"bg-warning-5":"","text-warning-600 dark:text-warning-400"];case n.Danger:return[r?"hover:bg-danger-5":"",e?"bg-danger-5":"","text-danger-600 dark:text-danger-400"];case n.Info:return[r?"hover:bg-info-5":"",e?"bg-info-5":"","text-info-600 dark:text-info-400"];case n.Neutral:return[r?"hover:bg-neutral-5":"",e?"bg-neutral-5":"","text-neutral-600 dark:text-neutral-400"];default:return["bg-transparent","text-neutral-600 dark:text-neutral-400"]}}export{l as B};

sqlmesh-0.232.0/web/client/dist/assets/ChevronDownIcon-MK_nrjD_.js → sqlmesh-0.233.0/web/client/dist/assets/ChevronDownIcon-CpX-qVKF.js

@@ -1 +1 @@
-import{r as e}from"./index-Dj0i1-CA.js";function t({title:r,titleId:a,...l},o){return e.createElement("svg",Object.assign({xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 20 20",fill:"currentColor","aria-hidden":"true","data-slot":"icon",ref:o,"aria-labelledby":a},l),r?e.createElement("title",{id:a},r):null,e.createElement("path",{fillRule:"evenodd",d:"M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z",clipRule:"evenodd"}))}const c=e.forwardRef(t);export{c as F};
+import{r as e}from"./index-BXLjZsq1.js";function t({title:r,titleId:a,...l},o){return e.createElement("svg",Object.assign({xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 20 20",fill:"currentColor","aria-hidden":"true","data-slot":"icon",ref:o,"aria-labelledby":a},l),r?e.createElement("title",{id:a},r):null,e.createElement("path",{fillRule:"evenodd",d:"M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z",clipRule:"evenodd"}))}const c=e.forwardRef(t);export{c as F};

sqlmesh-0.232.0/web/client/dist/assets/ChevronRightIcon-CLWtT22Q.js → sqlmesh-0.233.0/web/client/dist/assets/ChevronRightIcon-BIM_Whvm.js

@@ -1 +1 @@
-import{r as e}from"./index-Dj0i1-CA.js";function o({title:r,titleId:a,...t},l){return e.createElement("svg",Object.assign({xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 20 20",fill:"currentColor","aria-hidden":"true","data-slot":"icon",ref:l,"aria-labelledby":a},t),r?e.createElement("title",{id:a},r):null,e.createElement("path",{fillRule:"evenodd",d:"M8.22 5.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.75.75 0 0 1-1.06-1.06L11.94 10 8.22 6.28a.75.75 0 0 1 0-1.06Z",clipRule:"evenodd"}))}const i=e.forwardRef(o);export{i as F};
+import{r as e}from"./index-BXLjZsq1.js";function o({title:r,titleId:a,...t},l){return e.createElement("svg",Object.assign({xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 20 20",fill:"currentColor","aria-hidden":"true","data-slot":"icon",ref:l,"aria-labelledby":a},t),r?e.createElement("title",{id:a},r):null,e.createElement("path",{fillRule:"evenodd",d:"M8.22 5.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.75.75 0 0 1-1.06-1.06L11.94 10 8.22 6.28a.75.75 0 0 1 0-1.06Z",clipRule:"evenodd"}))}const i=e.forwardRef(o);export{i as F};