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

support contracts on models materialized as view #670

Merged
merged 6 commits into from
Mar 8, 2023
Merged

support contracts on models materialized as view #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40fe16d
first pass to add view mat contract check
emmyoop Mar 3, 2023
2750053
changelog, point to branch for testing, fix typo
emmyoop Mar 7, 2023
9be7851
fix tests
emmyoop Mar 7, 2023
d224557
fix skips
emmyoop Mar 7, 2023
3370145
remove dbt-core pin
emmyoop Mar 7, 2023
f4050f6
remove incremental temp logic
emmyoop Mar 8, 2023
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 .changes/unreleased/Features-20230223-180923.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kind: Features
body: implement data_type_code_to_name on SparkConnectionManager
body: Enforce contracts on models materialized as tables and views
time: 2023-02-23T18:09:23.787675-05:00
custom:
Author: michelleark
Issue: "639"
Author: michelleark emmyoop
Issue: 639 654
3 changes: 3 additions & 0 deletions dbt/include/spark/macros/adapters.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@
{% macro spark__create_view_as(relation, sql) -%}
create or replace view {{ relation }}
{{ comment_clause() }}
{% if config.get('contract', False) -%}
{{ get_assert_columns_equivalent(sql) }}
{%- endif %}
as
{{ sql }}
{% endmacro %}
Expand Down
29 changes: 24 additions & 5 deletions tests/functional/adapter/test_constraints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import pytest
from dbt.tests.util import relation_from_name
from dbt.tests.adapter.constraints.test_constraints import (
BaseConstraintsColumnsEqual,
BaseTableConstraintsColumnsEqual,
BaseViewConstraintsColumnsEqual,
BaseConstraintsRuntimeEnforcement
)
from dbt.tests.adapter.constraints.fixtures import (
Expand All @@ -28,8 +29,7 @@
constraints_yml = model_schema_yml.replace("text", "string").replace("primary key", "")


@pytest.mark.skip_profile('spark_session', 'apache_spark', 'databricks_http_cluster')
class TestSparkConstraintsColumnsEqualPyodbc(BaseConstraintsColumnsEqual):
class PyodbcSetup:
@pytest.fixture(scope="class")
def models(self):
return {
Expand Down Expand Up @@ -68,8 +68,7 @@ def data_types(self, int_type, schema_int_type, string_type):
]


@pytest.mark.skip_profile('spark_session', 'apache_spark', 'databricks_sql_endpoint', 'databricks_cluster')
class TestSparkConstraintsColumnsEqualDatabricksHTTP(BaseConstraintsColumnsEqual):
class DatabricksHTTPSetup:
@pytest.fixture(scope="class")
def models(self):
return {
Expand Down Expand Up @@ -107,6 +106,26 @@ def data_types(self, int_type, schema_int_type, string_type):
]


@pytest.mark.skip_profile('spark_session', 'apache_spark', 'databricks_http_cluster')
class TestSparkTableConstraintsColumnsEqualPyodbc(PyodbcSetup, BaseTableConstraintsColumnsEqual):
pass


@pytest.mark.skip_profile('spark_session', 'apache_spark', 'databricks_http_cluster')
class TestSparkViewConstraintsColumnsEqualPyodbc(PyodbcSetup, BaseViewConstraintsColumnsEqual):
pass


@pytest.mark.skip_profile('spark_session', 'apache_spark', 'databricks_sql_endpoint', 'databricks_cluster')
class TestSparkTableConstraintsColumnsEqualDatabricksHTTP(DatabricksHTTPSetup, BaseTableConstraintsColumnsEqual):
pass


@pytest.mark.skip_profile('spark_session', 'apache_spark', 'databricks_sql_endpoint', 'databricks_cluster')
class TestSparkViewConstraintsColumnsEqualDatabricksHTTP(DatabricksHTTPSetup, BaseViewConstraintsColumnsEqual):
pass


@pytest.mark.skip_profile('spark_session', 'apache_spark')
class TestSparkConstraintsRuntimeEnforcement(BaseConstraintsRuntimeEnforcement):
@pytest.fixture(scope="class")
Expand Down