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.

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

Feature/incremental predicates #161

Merged
merged 25 commits into from
Dec 15, 2022
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1144463
incremental predicate support
dave-connors-3 Aug 22, 2022
89e4dad
add inremental predicates tests
dave-connors-3 Aug 22, 2022
52d2cb3
Merge branch 'main' into feature/incremental-predicates
dave-connors-3 Aug 23, 2022
8288b02
pin core branch
dave-connors-3 Aug 26, 2022
b8f4b17
Merge branch 'feature/incremental-predicates' of github.com:dave-conn…
dave-connors-3 Aug 26, 2022
b09add7
spark branch
dave-connors-3 Aug 26, 2022
041f718
resolve conflicts
dave-connors-3 Aug 26, 2022
a81fe55
revert raw strategy line
dave-connors-3 Aug 30, 2022
a2ad599
reorder configs
dave-connors-3 Sep 6, 2022
a8e5d78
new functional test
dave-connors-3 Nov 28, 2022
9263153
remove old integration test and fix merge conflict
dave-connors-3 Dec 1, 2022
d6f4a8e
handle predicates config, add test
dave-connors-3 Dec 1, 2022
5eb9190
Merge branch 'databricks:main' into feature/incremental-predicates
dave-connors-3 Dec 15, 2022
161c052
unpin feature branch
dave-connors-3 Dec 15, 2022
03faac0
additional line change
dave-connors-3 Dec 15, 2022
f7ddfc3
remove old integration test seed
dave-connors-3 Dec 15, 2022
74616b1
remove default configs
dave-connors-3 Dec 15, 2022
07a8dc7
Merge branch 'feature/incremental-predicates' of github.com:dave-conn…
dave-connors-3 Dec 15, 2022
b6ae5cb
remove seed
dave-connors-3 Dec 15, 2022
3a06bb7
changelog entry
dave-connors-3 Dec 15, 2022
8527800
apply black formatting to test
dave-connors-3 Dec 15, 2022
1e8d54d
restore removed file
dave-connors-3 Dec 15, 2022
33dbe72
rename variable in integration test
dave-connors-3 Dec 15, 2022
1b0b1d4
Update tests/functional/adapter/test_incremental_predicates.py
ueshin Dec 15, 2022
5d287d4
Update tests/functional/adapter/test_incremental_predicates.py
ueshin Dec 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

### Features
- Support Python 3.11 ([#233](https://github.com/databricks/dbt-databricks/pull/233))
- Support `incremental_predicates` ([#161](https://github.com/databricks/dbt-databricks/pull/161))

## dbt-databricks 1.3.3 (Release TBD)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

{#-- Set vars --#}

{%- set incremental_predicates = config.get('predicates', default=none) or config.get('incremental_predicates', default=none) -%}
{%- set unique_key = config.get('unique_key', none) -%}
{%- set partition_by = config.get('partition_by', none) -%}
{%- set language = model['language'] -%}
Expand Down Expand Up @@ -54,7 +55,7 @@
'temp_relation': temp_relation,
'unique_key': unique_key,
'dest_columns': none,
'predicates': none}) -%}
'incremental_predicates': incremental_predicates}) -%}
{%- set build_sql = strategy_sql_macro_func(strategy_arg_dict) -%}
{%- if language == 'sql' -%}
{%- call statement('main') -%}
Expand Down
51 changes: 51 additions & 0 deletions tests/functional/adapter/test_incremental_predicates.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import pytest
from dbt.tests.adapter.incremental.test_incremental_predicates import BaseIncrementalPredicates


models__databricks_incremental_predicates_sql = """
{{ config(
materialized = 'incremental',
unique_key = 'id'
) }}

{% if not is_incremental() %}

select cast(1 as bigint) as id, 'hello' as msg, 'blue' as color
union all
select cast(2 as bigint) as id, 'goodbye' as msg, 'red' as color

{% else %}

-- merge will not happen on the above record where id = 2, so new record will fall to insert
select cast(1 as bigint) as id, 'hey' as msg, 'blue' as color
union all
select cast(2 as bigint) as id, 'yo' as msg, 'green' as color
union all
select cast(3 as bigint) as id, 'anyway' as msg, 'purple' as color

{% endif %}
"""


class TestIncrementalPredicatesMergeDatabricks(BaseIncrementalPredicates):
@pytest.fixture(scope="class")
def project_config_update(self):
return {"models": {"+incremental_predicates": ["dbt_internal_dest.id != 2"]}}

@pytest.fixture(scope="class")
def models(self):
return {
"delete_insert_incremental_predicates.sql": models__databricks_incremental_predicates_sql
}
ueshin marked this conversation as resolved.
Show resolved Hide resolved


class TestPredicatesMergeDatabricks(BaseIncrementalPredicates):
@pytest.fixture(scope="class")
def project_config_update(self):
return {"models": {"+predicates": ["dbt_internal_dest.id != 2"]}}

@pytest.fixture(scope="class")
def models(self):
return {
"delete_insert_incremental_predicates.sql": models__databricks_incremental_predicates_sql
}
ueshin marked this conversation as resolved.
Show resolved Hide resolved