Skip to content

Commit 6468afb

Browse files
committed
feedback2
1 parent 25822fe commit 6468afb

File tree

1 file changed

+25
-16
lines changed

1 file changed

+25
-16
lines changed

sqlmesh/core/snapshot/evaluator.py

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,13 +1523,9 @@ def append(
15231523
render_kwargs: t.Dict[str, t.Any],
15241524
**kwargs: t.Any,
15251525
) -> None:
1526-
columns_to_types = kwargs.pop("columns_to_types", model.columns_to_types)
1527-
source_columns = kwargs.pop("source_columns", None)
15281526
self.adapter.insert_append(
15291527
table_name,
15301528
query_or_df,
1531-
target_columns_to_types=columns_to_types,
1532-
source_columns=source_columns,
15331529
)
15341530

15351531
def create(
@@ -1649,16 +1645,13 @@ def _get_target_and_source_columns(
16491645
model: Model,
16501646
table_name: str,
16511647
render_kwargs: t.Dict[str, t.Any],
1652-
target_column_to_types: t.Optional[t.Dict[str, exp.DataType]] = None,
16531648
force_get_columns_from_target: bool = False,
16541649
) -> t.Tuple[t.Dict[str, exp.DataType], t.Optional[t.List[str]]]:
16551650
if force_get_columns_from_target:
16561651
target_column_to_types = self.adapter.columns(table_name)
1657-
elif target_column_to_types:
1658-
target_column_to_types = target_column_to_types
16591652
else:
16601653
target_column_to_types = (
1661-
model.columns_to_types
1654+
model.columns_to_types # type: ignore
16621655
if model.annotated and not model.on_destructive_change.is_ignore
16631656
else self.adapter.columns(table_name)
16641657
)
@@ -1784,6 +1777,24 @@ def append(
17841777

17851778

17861779
class IncrementalUnmanagedStrategy(MaterializableStrategy):
1780+
def append(
1781+
self,
1782+
table_name: str,
1783+
query_or_df: QueryOrDF,
1784+
model: Model,
1785+
render_kwargs: t.Dict[str, t.Any],
1786+
**kwargs: t.Any,
1787+
) -> None:
1788+
columns_to_types, source_columns = self._get_target_and_source_columns(
1789+
model, table_name, render_kwargs=render_kwargs
1790+
)
1791+
self.adapter.insert_append(
1792+
table_name,
1793+
query_or_df,
1794+
target_columns_to_types=columns_to_types,
1795+
source_columns=source_columns,
1796+
)
1797+
17871798
def insert(
17881799
self,
17891800
table_name: str,
@@ -1797,13 +1808,13 @@ def insert(
17971808
return self._replace_query_for_model(
17981809
model, table_name, query_or_df, render_kwargs, **kwargs
17991810
)
1800-
columns_to_types, source_columns = self._get_target_and_source_columns(
1801-
model,
1802-
table_name,
1803-
render_kwargs=render_kwargs,
1804-
target_column_to_types=kwargs.pop("columns_to_types", None),
1805-
)
18061811
if isinstance(model.kind, IncrementalUnmanagedKind) and model.kind.insert_overwrite:
1812+
columns_to_types, source_columns = self._get_target_and_source_columns(
1813+
model,
1814+
table_name,
1815+
render_kwargs=render_kwargs,
1816+
)
1817+
18071818
return self.adapter.insert_overwrite_by_partition(
18081819
table_name,
18091820
query_or_df,
@@ -1816,8 +1827,6 @@ def insert(
18161827
query_or_df,
18171828
model,
18181829
render_kwargs=render_kwargs,
1819-
columns_to_types=columns_to_types,
1820-
source_columns=source_columns,
18211830
**kwargs,
18221831
)
18231832

0 commit comments

Comments
 (0)