Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions sqlmesh/dbt/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import datetime
import typing as t
import logging

from sqlglot import exp
from sqlglot.errors import SqlglotError
Expand Down Expand Up @@ -34,6 +35,8 @@
from sqlmesh.core.audit.definition import ModelAudit
from sqlmesh.dbt.context import DbtContext

logger = logging.getLogger(__name__)


INCREMENTAL_BY_TIME_STRATEGIES = set(["delete+insert", "insert_overwrite", "microbatch"])
INCREMENTAL_BY_UNIQUE_KEY_STRATEGIES = set(["merge"])
Expand Down Expand Up @@ -503,6 +506,7 @@ def to_sqlmesh(
"""Converts the dbt model into a SQLMesh model."""
model_dialect = self.dialect(context)
query = d.jinja_query(self.sql_no_config)
kind = self.model_kind(context)

optional_kwargs: t.Dict[str, t.Any] = {}
physical_properties: t.Dict[str, t.Any] = {}
Expand All @@ -522,15 +526,20 @@ def to_sqlmesh(
optional_kwargs["partitioned_by"] = partitioned_by

if self.cluster_by:
clustered_by = []
for c in self.cluster_by:
try:
clustered_by.append(d.parse_one(c, dialect=model_dialect))
except SqlglotError as e:
raise ConfigError(
f"Failed to parse model '{self.canonical_name(context)}' cluster_by field '{c}' in '{self.path}': {e}"
) from e
optional_kwargs["clustered_by"] = clustered_by
if isinstance(kind, ViewKind):
logger.warning(
f"Ignoring cluster_by config for model '{self.name}'; cluster_by is not supported for views."
)
else:
clustered_by = []
for c in self.cluster_by:
try:
clustered_by.append(d.parse_one(c, dialect=model_dialect))
except SqlglotError as e:
raise ConfigError(
f"Failed to parse model '{self.canonical_name(context)}' cluster_by field '{c}' in '{self.path}': {e}"
) from e
optional_kwargs["clustered_by"] = clustered_by

model_kwargs = self.sqlmesh_model_kwargs(context)
if self.sql_header:
Expand Down Expand Up @@ -627,7 +636,6 @@ def to_sqlmesh(
if physical_properties:
model_kwargs["physical_properties"] = physical_properties

kind = self.model_kind(context)
allow_partials = model_kwargs.pop("allow_partials", None)
if (
allow_partials is None
Expand Down
11 changes: 11 additions & 0 deletions tests/dbt/test_transformation.py
Original file line number Diff line number Diff line change
Expand Up @@ -1837,6 +1837,17 @@ def test_model_cluster_by():
exp.to_column('"QUX"'),
]

model = ModelConfig(
name="model",
alias="model",
package_name="package",
target_schema="test",
cluster_by=["Bar", "qux"],
sql="SELECT * FROM baz",
materialized=Materialization.VIEW.value,
)
assert model.to_sqlmesh(context).clustered_by == []


def test_snowflake_dynamic_table():
context = DbtContext()
Expand Down