Skip to content

Commit

Permalink
Merge pull request #85 from bcodell/bryce/update-dbt
Browse files Browse the repository at this point in the history
Bryce/update dbt
  • Loading branch information
bcodell authored Jan 16, 2025
2 parents d8eb095 + c082709 commit 4fb1e68
Show file tree
Hide file tree
Showing 13 changed files with 733 additions and 262 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.12.8'
- name: Install Poetry
run: curl -sSL https://install.python-poetry.org | python - --version 1.6.1
run: curl -sSL https://install.python-poetry.org | python - --version 2.0.1
- name: Install Python Dependencies
run: |
poetry config virtualenvs.create false
Expand Down
7 changes: 6 additions & 1 deletion integration_tests/dbt_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ vars:
model_prefix: customer__


flags:
send_anonymous_usage_stats: False
use_colors: True


seeds:
dbt_activity_schema_integration_tests:
datasets:
Expand All @@ -43,4 +48,4 @@ seeds:

dispatch:
- macro_namespace: dbt
search_order: ['dbt_activity_schema_integration_tests', 'dbt_activity_schema', 'dbt']
search_order: ['dbt_activity_schema_integration_tests', 'dbt_activity_schema', 'dbt']
4 changes: 2 additions & 2 deletions integration_tests/models/datasets/aql_syntax/schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ models:

- name: dataset__filtered
description: A test to validate the functionality of filter clauses in aql.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__filtered")

- name: dataset__joined
description: A test to validate the functionality of join clauses in aql.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__joined")

32 changes: 16 additions & 16 deletions integration_tests/models/datasets/primary__all/schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,100 +4,100 @@ models:

- name: dataset__select_all_aggregate_after
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and aggregates after to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_aggregate_after")

- name: dataset__select_all_aggregate_all
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and aggregates all to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_aggregate_all")

- name: dataset__select_all_aggregate_before
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and aggregates before to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_aggregate_before")

- name: dataset__select_all_aggregate_between
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and aggregates between to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_aggregate_between")


- name: dataset__select_all_append_first_after
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends a first after joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_first_after")

- name: dataset__select_all_append_first_before
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends a first before joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_first_before")

- name: dataset__select_all_append_first_between
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends a first between joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_first_between")

- name: dataset__select_all_append_first_ever
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends a first ever joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_first_ever")


- name: dataset__select_all_append_nth_after
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends an nth after joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_nth_after")

- name: dataset__select_all_append_nth_before
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends an nth before joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_nth_before")

- name: dataset__select_all_append_nth_between
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends an nth between joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_nth_between")

- name: dataset__select_all_append_nth_ever
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends an nth ever joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_nth_ever")


- name: dataset__select_all_append_last_after
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends a last after joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_last_after")

- name: dataset__select_all_append_last_before
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends a last before joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_last_before")

- name: dataset__select_all_append_last_between
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends a last between joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_last_between")

- name: dataset__select_all_append_last_ever
description: A test to validate compatibility of a dataset that selects all instances of a primary activity and appends a last ever joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_all_append_last_ever")

32 changes: 16 additions & 16 deletions integration_tests/models/datasets/primary__first/schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,100 +4,100 @@ models:

- name: dataset__select_first_aggregate_after
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and aggregates after to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_aggregate_after")

- name: dataset__select_first_aggregate_all
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and aggregates all to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_aggregate_all")

- name: dataset__select_first_aggregate_before
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and aggregates before to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_aggregate_before")

- name: dataset__select_first_aggregate_between
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and aggregates between to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_aggregate_between")


- name: dataset__select_first_append_first_after
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends a first after joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_first_after")

- name: dataset__select_first_append_first_before
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends a first before joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_first_before")

- name: dataset__select_first_append_first_between
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends a first between joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_first_between")

- name: dataset__select_first_append_first_ever
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends a first ever joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_first_ever")


- name: dataset__select_first_append_nth_after
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends an nth after joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_nth_after")

- name: dataset__select_first_append_nth_before
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends an nth before joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_nth_before")

- name: dataset__select_first_append_nth_between
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends an nth between joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_nth_between")

- name: dataset__select_first_append_nth_ever
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends an nth ever joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_nth_ever")


- name: dataset__select_first_append_last_after
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends a last after joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_last_after")

- name: dataset__select_first_append_last_before
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends a last before joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_last_before")

- name: dataset__select_first_append_last_between
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends a last between joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_last_between")

- name: dataset__select_first_append_last_ever
description: A test to validate compatibility of a dataset that selects the first instance of a primary activity and appends a last ever joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_first_append_last_ever")

32 changes: 16 additions & 16 deletions integration_tests/models/datasets/primary__last/schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,100 +4,100 @@ models:

- name: dataset__select_last_aggregate_after
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and aggregates after to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_aggregate_after")

- name: dataset__select_last_aggregate_all
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and aggregates all to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_aggregate_all")

- name: dataset__select_last_aggregate_before
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and aggregates before to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_aggregate_before")

- name: dataset__select_last_aggregate_between
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and aggregates between to a joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_aggregate_between")


- name: dataset__select_last_append_first_after
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends a first after joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_first_after")

- name: dataset__select_last_append_first_before
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends a first before joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_first_before")

- name: dataset__select_last_append_first_between
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends a first between joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_first_between")

- name: dataset__select_last_append_first_ever
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends a first ever joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_first_ever")


- name: dataset__select_last_append_nth_after
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends an nth after joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_nth_after")

- name: dataset__select_last_append_nth_before
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends an nth before joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_nth_before")

- name: dataset__select_last_append_nth_between
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends an nth between joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_nth_between")

- name: dataset__select_last_append_nth_ever
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends an nth ever joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_nth_ever")


- name: dataset__select_last_append_last_after
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends a last after joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_last_after")

- name: dataset__select_last_append_last_before
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends a last before joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_last_before")

- name: dataset__select_last_append_last_between
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends a last between joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_last_between")

- name: dataset__select_last_append_last_ever
description: A test to validate compatibility of a dataset that selects the last instance of a primary activity and appends a last ever joined activity.
tests:
data_tests:
- dbt_utils.equality:
compare_model: ref("output__select_last_append_last_ever")

Loading

0 comments on commit 4fb1e68

Please sign in to comment.