Skip to content

fix!: support target_columns_to_types #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eakmanrq merged 1 commit into from
Aug 25, 2025
Merged

fix!: support target_columns_to_types #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 14 additions & 5 deletions sqlmesh_utils/materializations/non_idempotent_incremental_by_time_range.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from sqlmesh.utils.date import TimeLike
from sqlmesh.core.engine_adapter.base import MERGE_SOURCE_ALIAS, MERGE_TARGET_ALIAS
from sqlmesh import CustomKind
from sqlmesh.utils import columns_to_types_all_known

if t.TYPE_CHECKING:
from sqlmesh.core.engine_adapter._typing import QueryOrDF
Expand Down Expand Up @@ -76,6 +75,7 @@ def insert(
query_or_df: QueryOrDF,
model: Model,
is_first_insert: bool,
render_kwargs: t.Dict[str, t.Any],
**kwargs: t.Any,
) -> None:
# sanity check
Expand All @@ -88,9 +88,15 @@ def insert(
start: TimeLike = kwargs["start"]
end: TimeLike = kwargs["end"]

columns_to_types = model.columns_to_types
if not columns_to_types or not columns_to_types_all_known(columns_to_types):
columns_to_types = self.adapter.columns(table_name)
if is_first_insert and not self.adapter.table_exists(table_name):
self.adapter.ctas(
table_name=table_name,
query_or_df=model.ctas_query(**render_kwargs),
)

columns_to_types, source_columns = self._get_target_and_source_columns(
model, table_name, render_kwargs=render_kwargs
)

low, high = [
model.convert_to_time_column(dt, columns_to_types)
Expand All @@ -116,22 +122,25 @@ def _inject_alias(node: exp.Expression, alias: str) -> exp.Expression:
self.adapter.merge(
target_table=table_name,
source_table=query_or_df,
columns_to_types=columns_to_types,
target_columns_to_types=columns_to_types,
unique_key=model.kind.primary_key,
merge_filter=exp.and_(*betweens),
source_columns=source_columns,
)

def append(
self,
table_name: str,
query_or_df: QueryOrDF,
model: Model,
render_kwargs: t.Dict[str, t.Any],
**kwargs: t.Any,
) -> None:
self.insert(
table_name=table_name,
query_or_df=query_or_df,
model=model,
is_first_insert=False,
render_kwargs=render_kwargs,
**kwargs,
)
6 changes: 3 additions & 3 deletions ...materializations/integration/test_integration_non_idempotent_incremental_by_time_range.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def test_basic_usage(project: Project):
}

project.engine_adapter.create_table(
upstream_table_name, columns_to_types=upstream_table_columns
upstream_table_name, target_columns_to_types=upstream_table_columns
)
project.engine_adapter.insert_append(
upstream_table_name,
Expand Down Expand Up @@ -122,7 +122,7 @@ def test_partial_restatement(project: Project):
}

project.engine_adapter.create_table(
upstream_table_name, columns_to_types=upstream_table_columns
upstream_table_name, target_columns_to_types=upstream_table_columns
)
project.engine_adapter.insert_append(
upstream_table_name,
Expand Down Expand Up @@ -174,7 +174,7 @@ def test_partial_restatement(project: Project):
# change upstream data
project.engine_adapter.drop_table(upstream_table_name)
project.engine_adapter.create_table(
upstream_table_name, columns_to_types=upstream_table_columns
upstream_table_name, target_columns_to_types=upstream_table_columns
)
project.engine_adapter.insert_append(
upstream_table_name,
Expand Down
7 changes: 5 additions & 2 deletions tests/materializations/test_non_idempotent_incremental_by_time_range.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,11 @@ def test_insert(make_model: ModelMaker, make_mocked_engine_adapter: MockedEngine
is_first_insert=True,
start=start,
end=end,
render_kwargs={},
)

assert to_sql_calls(adapter) == [
'DESCRIBE "test"."snapshot_table"',
parse_one(
"""
MERGE INTO "test"."snapshot_table" AS "__merge_target__"
Expand All @@ -115,7 +117,7 @@ def test_insert(make_model: ModelMaker, make_mocked_engine_adapter: MockedEngine
WHEN NOT MATCHED THEN INSERT ("name", "ds") VALUES ("__MERGE_SOURCE__"."name", "__MERGE_SOURCE__"."ds")
""",
dialect=adapter.dialect,
).sql(dialect=adapter.dialect)
).sql(dialect=adapter.dialect),
]


Expand All @@ -135,6 +137,7 @@ def test_append(make_model: ModelMaker, make_mocked_engine_adapter: MockedEngine
model=model,
start=start,
end=end,
render_kwargs={},
)

assert to_sql_calls(adapter) == [
Expand All @@ -158,7 +161,7 @@ def test_append(make_model: ModelMaker, make_mocked_engine_adapter: MockedEngine
WHEN NOT MATCHED THEN INSERT ("name", "ds") VALUES ("__MERGE_SOURCE__"."name", "__MERGE_SOURCE__"."ds")
""",
dialect=adapter.dialect,
).sql(dialect=adapter.dialect)
).sql(dialect=adapter.dialect),
]


Expand Down