Skip to content

Commit 46073d0

Browse files
adapt to use instance check
1 parent c3941c6 commit 46073d0

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.circleci/continue_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,10 @@ workflows:
299299
engine:
300300
- snowflake
301301
- databricks
302-
# - redshift
302+
- redshift
303303
- bigquery
304-
# - clickhouse-cloud
305-
# - athena
304+
- clickhouse-cloud
305+
- athena
306306
# filters:
307307
# branches:
308308
# only:

tests/core/engine_adapter/integration/test_integration.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from sqlmesh.core.dialect import select_from_values
2525
from sqlmesh.core.model import Model, load_sql_based_model
2626
from sqlmesh.core.engine_adapter.shared import DataObject, DataObjectType
27-
from sqlmesh.core.engine_adapter.mixins import RowDiffMixin
27+
from sqlmesh.core.engine_adapter.mixins import RowDiffMixin, LogicalMergeMixin
2828
from sqlmesh.core.model.definition import create_sql_model
2929
from sqlmesh.core.plan import Plan
3030
from sqlmesh.core.state_sync.db import EngineAdapterStateSync
@@ -1902,10 +1902,18 @@ def test_incremental_by_unique_key_model_when_matched(ctx: TestContext):
19021902
pytest.skip(f"{ctx.dialect} on {ctx.gateway} doesnt support merge")
19031903

19041904
# DuckDB and some other engines use logical_merge which doesn't support when_matched
1905-
if ctx.dialect not in ["bigquery", "databricks", "postgres", "snowflake", "spark"]:
1906-
pytest.skip(f"{ctx.dialect} doesn't support native MERGE with when_matched clause")
1905+
if isinstance(ctx.engine_adapter, LogicalMergeMixin):
1906+
pytest.skip(
1907+
f"{ctx.dialect} on {ctx.gateway} uses logical merge which doesn't support when_matched"
1908+
)
19071909

1908-
context = ctx.create_context()
1910+
def _mutate_config(current_gateway_name: str, config: Config):
1911+
connection = config.gateways[current_gateway_name].connection
1912+
connection.concurrent_tasks = 1
1913+
if current_gateway_name == "inttest_redshift":
1914+
connection.enable_merge = True
1915+
1916+
context = ctx.create_context(_mutate_config)
19091917
schema = ctx.schema(TEST_SCHEMA)
19101918

19111919
# Create seed data with multiple days

0 commit comments

Comments
 (0)