Skip to content
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

Jump to bottom

fix: use table alias when creating dataset #192

Merged
merged 1 commit into from
Feb 27, 2023
Merged

fix: use table alias when creating dataset #192

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
6 changes: 3 additions & 3 deletions src/preset_cli/cli/superset/sync/dbt/datasets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def create_dataset(
kwargs = {
"database": database["id"],
"schema": model["schema"],
"table_name": model["name"],
"table_name": model.get("alias") or model["name"],
}
else:
engine = create_engine(url)
Expand All @@ -59,7 +59,7 @@ def create_dataset(
kwargs = {
"database": database["id"],
"schema": model["schema"],
"table_name": model["name"],
"table_name": model.get("alias") or model["name"],
"sql": f"SELECT * FROM {source}",
}

Expand All @@ -85,7 +85,7 @@ def sync_datasets( # pylint: disable=too-many-locals, too-many-branches, too-ma
filters = {
"database": OneToMany(database["id"]),
"schema": model["schema"],
"table_name": model["name"],
"table_name": model.get("alias") or model["name"],
}
existing = client.get_datasets(**filters)
if len(existing) > 1:
Expand Down
90 changes: 90 additions & 0 deletions tests/cli/superset/sync/dbt/datasets_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,96 @@ def test_sync_datasets_new(mocker: MockerFixture) -> None:
)


def test_sync_datasets_with_alias(mocker: MockerFixture) -> None:
"""
Test ``sync_datasets`` when datasets has an alias.
"""
client = mocker.MagicMock()
client.get_datasets.return_value = []
client.create_dataset.side_effect = [{"id": 1}, {"id": 2}, {"id": 3}]
client.get_dataset.return_value = {
"columns": [
{"column_name": "id", "is_dttm": False, "type_generic": "INTEGER"},
{"column_name": "ts", "is_dttm": True, "type_generic": "TIMESTAMP"},
],
}

models_with_alias: List[ModelSchema] = [
model_schema.load(
{
"alias": "model_alias",
"database": "examples_dev",
"schema": "public",
"description": "",
"meta": {},
"name": "messages_channels",
"unique_id": "model.superset_examples.messages_channels",
"columns": {"id": {"description": "Primary key"}},
},
),
]
sync_datasets(
client=client,
models=models_with_alias,
metrics=metrics,
database={"id": 1, "sqlalchemy_uri": "postgresql://user@host/examples_dev"},
disallow_edits=False,
external_url_prefix="",
)
client.create_dataset.assert_has_calls(
[
mock.call(database=1, schema="public", table_name="model_alias"),
],
)
client.update_dataset.assert_has_calls(
[
mock.call(
1,
override_columns=True,
description="",
extra=json.dumps(
{
"unique_id": "model.superset_examples.messages_channels",
"depends_on": "ref('messages_channels')",
"certification": {"details": "This table is produced by dbt"},
},
),
is_managed_externally=False,
metrics=[],
),
mock.call(
1,
override_columns=False,
metrics=[
{
"expression": "COUNT(*)",
"metric_name": "cnt",
"metric_type": "count",
"verbose_name": "",
"description": "",
"extra": "{}",
},
],
),
mock.call(
1,
override_columns=True,
columns=[
{
"column_name": "id",
"description": "Primary key",
"is_dttm": False,
},
{
"column_name": "ts",
"is_dttm": True,
},
],
),
],
)


def test_sync_datasets_no_metrics(mocker: MockerFixture) -> None:
"""
Test ``sync_datasets`` when no datasets exist yet.
Expand Down