Skip to content

Commit 0e24891

Browse files
committed
a few more macro fixes and updates
1 parent 57526f9 commit 0e24891

File tree

7 files changed

+52
-20
lines changed

7 files changed

+52
-20
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
packages:
2+
- local: ../../
3+
- local: ../../dbt-audit-helper
4+
- local: ../../dbt-audit-helper/integration_tests
5+
- package: dbt-labs/dbt_utils
6+
version: 1.3.0
7+
- local: ../
8+
sha1_hash: 6514ce239efacea424bc5221ed12aa46aedc35e8

integration_tests/dbt_date/dbt_project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dispatch:
1818
["tsql_utils_dbt_date_integration_tests", "tsql_utils", "dbt", "dbt_date"]
1919

2020
vars:
21-
"dbt_date:time_zone": "Pacific Standard Time"
21+
"dbt_date:time_zone": "UTC"
2222

2323
models:
2424
dbt_date_integration_tests:
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
packages:
2+
- local: ../../
3+
- local: ../../dbt-date
4+
- local: ../../dbt-date/integration_tests
5+
- local: ../
6+
sha1_hash: 23e06fdd28a6456704c5398f7e588a034e2a03de

integration_tests/dbt_expectations/dbt_project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dispatch:
3131
]
3232

3333
vars:
34-
"dbt_date:time_zone": "Pacific Standard Time"
34+
"dbt_date:time_zone": "UTC"
3535

3636
models:
3737
dbt_expectations_integration_tests:
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
packages:
2+
- local: ../../
3+
- local: ../../dbt-expectations
4+
- local: ../../dbt-expectations/integration_tests
5+
- package: calogica/dbt_date
6+
version: 0.10.1
7+
- local: ../
8+
sha1_hash: 5723a05ef1d9b9d1f7961a55d573231dca0b0644

integration_tests/dbt_utils/dbt_project.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ models:
2525
enabled: false
2626
test_url_path: *disabled
2727
test_urls: *disabled
28-
cross_db_utils: *disabled
2928
sql:
3029
test_generate_series: *disabled
3130
test_get_column_values: *disabled
@@ -34,25 +33,21 @@ models:
3433
test_groupby: *disabled
3534
test_union: *disabled
3635
test_unpivot_bool: *disabled
37-
materializations:
38-
test_insert_by_period: *disabled
36+
test_get_single_value: *disabled
37+
test_get_single_value_default: *disabled
3938

4039
data_tests:
4140
dbt_utils_integration_tests: *disabled
4241

4342
seeds:
4443
dbt_utils_integration_tests:
45-
cross_db: *disabled
4644
schema_tests:
47-
data_test_sequential_timestamps:
48-
+column_types:
49-
my_timestamp: datetime2
50-
data_test_unique_where: *disabled
51-
data_test_not_null_where: *disabled
45+
data_test_sequential_timestamps: *disabled
5246
data_test_mutually_exclusive_ranges_with_gaps_zero_length: *disabled
5347
data_test_mutually_exclusive_ranges_no_gaps: *disabled
5448
data_test_mutually_exclusive_ranges_with_gaps: *disabled
5549

5650
sql:
5751
data_unpivot_bool: *disabled
5852
data_unpivot_bool_expected: *disabled
53+
data_get_single_value: *disabled
Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,34 @@
1-
{% macro fabric__test_sequential_values(model, column_name, interval=1, datepart=None) %}
1+
{% macro fabric__test_sequential_values(model, column_name, interval=1, datepart=None, group_by_columns = []) %}
2+
3+
{% if group_by_columns|length() > 0 %}
4+
{% set select_gb_cols = group_by_columns|join(',') + ', ' %}
5+
{% set partition_gb_cols = 'partition by ' + group_by_columns|join(',') %}
6+
{% endif %}
7+
8+
with windowed as (
29

310
select
4-
*
5-
from (
6-
select
11+
{{ select_gb_cols }}
712
{{ column_name }},
813
lag({{ column_name }}) over (
14+
{{partition_gb_cols}}
915
order by {{ column_name }}
10-
) as previous_{{ column_name }}
11-
from {{ model }}
12-
) required_alias_for_tsql
16+
) as {{ previous_column_name }}
17+
from {{ model }} required_alias_for_tsql
18+
),
19+
20+
validation_errors as (
21+
select
22+
*
23+
from windowed
1324
{% if datepart %}
14-
where not(cast({{ column_name }} as {{ dbt.type_timestamp() }})= cast({{ dbt.dateadd(datepart, interval, 'previous_' + column_name) }} as {{ dbt.type_timestamp() }}))
25+
where not(cast({{ column_name }} as {{ dbt.type_timestamp() }})= cast({{ dbt.dateadd(datepart, interval, previous_column_name) }} as {{ dbt.type_timestamp() }}))
1526
{% else %}
16-
where not({{ column_name }} = previous_{{ column_name }} + {{ interval }})
27+
where not({{ column_name }} = {{ previous_column_name }} + {{ interval }})
1728
{% endif %}
29+
)
30+
31+
select *
32+
from validation_errors
1833

1934
{% endmacro %}

0 commit comments

Comments
 (0)