Skip to content

Commit 4095875

Browse files
mateuszklimekmateuszklimek
authored
Rename where to condition (#101)
1 parent fb11f2b commit 4095875

3 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎integration_tests/models/transformed/schema.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ models:
3535
- re_data.assert_less:
3636
metric: min
3737
value: 100
38-
where: time_window_start >= '2020-05-02'
38+
condition: time_window_start = '2021-05-02'
3939

4040
- re_data.assert_less_equal:
4141
metric: min
4242
value: 107
4343

4444
- name: value2
4545
tests:
46-
- re_data.assert_greater:
46+
- re_data.assert_greater_equal:
4747
metric: min
4848
value: 200
49-
where: time_window_start >= '2020-05-02'
49+
condition: time_window_start = '2021-05-02'

‎integration_tests/seeds/monitoring/expected_test_history.csv‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
table_name,column_name,test_name,status,message,failures_count,severity
2+
TEST_RE_DATA_METRICS,---,pected_metrics_,Pass,---,0,ERROR
3+
TEST_RE_DATA_TABLE_SAMPLES,---,_table_samples_,Pass,---,0,ERROR
24
TEST_RE_DATA_Z_SCORE,---,pected_z_score_,Pass,---,0,ERROR
35
TEST_RE_DATA_ANOMALIES,---,cted_anomalies_,Pass,---,0,ERROR
4-
TEST_RE_DATA_TABLE_SAMPLES,---,_table_samples_,Pass,---,0,ERROR
5-
TEST_RE_DATA_METRICS,---,pected_metrics_,Pass,---,0,ERROR
6+
BUY_EVENTS,---,_table_rows__10,Pass,---,0,ERROR
67
BUY_EVENTS,---,ts_row_count__1,Pass,---,0,ERROR
7-
BUY_EVENTS,VALUE2,alue2__min__200,Pass,---,0,ERROR
88
BUY_EVENTS,---,null__freshness,Pass,---,0,ERROR
9-
BUY_EVENTS,---,_table_rows__10,Pass,---,0,ERROR
10-
BUY_EVENTS,VALUE1,alue1__min__100,Pass,---,0,ERROR
11-
BUY_EVENTS,---,0__row_count__0,Pass,---,0,ERROR
9+
BUY_EVENTS,VALUE2,5_02___min__200,Pass,---,0,ERROR
1210
BUY_EVENTS,VALUE1,alue1__min__107,Pass,---,0,ERROR
1311
BUY_EVENTS,VALUE1,ulls_percent__0,Pass,---,0,ERROR
14-
BUY_EVENTS,VALUE1,__nulls_percent,Pass,---,0,ERROR
12+
BUY_EVENTS,VALUE1,5_02___min__100,Pass,---,0,ERROR
13+
BUY_EVENTS,---,0__row_count__0,Pass,---,0,ERROR
1514
RE_DATA_METRICS,---,_buy_events___3,Pass,---,0,ERROR
1615
RE_DATA_METRICS,---,ref_buy_events_,Pass,---,0,ERROR
1716
RE_DATA_METRICS,---,ref_buy_events_,Pass,---,0,ERROR
17+
BUY_EVENTS,VALUE1,__nulls_percent,Pass,---,0,ERROR
1818
RE_DATA_METRICS,---,ref_buy_events_,Pass,---,0,ERROR
19-
BUY_EVENTS,---,null__freshness,Pass,---,0,ERROR
19+
TEST_RE_DATA_TABLE_SAMPLES,---,_table_samples_,Pass,---,0,ERROR
20+
TEST_RE_DATA_ANOMALIES,---,cted_anomalies_,Pass,---,0,ERROR
2021
BUY_EVENTS,---,ts_row_count__1,Pass,---,0,ERROR
22+
BUY_EVENTS,---,null__freshness,Pass,---,0,ERROR
23+
BUY_EVENTS,VALUE2,5_02___min__200,Pass,---,0,ERROR
2124
BUY_EVENTS,---,_table_rows__10,Pass,---,0,ERROR
22-
BUY_EVENTS,VALUE2,alue2__min__200,Pass,---,0,ERROR
23-
BUY_EVENTS,---,0__row_count__0,Pass,---,0,ERROR
2425
BUY_EVENTS,VALUE1,ulls_percent__0,Pass,---,0,ERROR
26+
BUY_EVENTS,---,0__row_count__0,Pass,---,0,ERROR
27+
BUY_EVENTS,VALUE1,5_02___min__100,Pass,---,0,ERROR
2528
BUY_EVENTS,VALUE1,alue1__min__107,Pass,---,0,ERROR
26-
BUY_EVENTS,VALUE1,alue1__min__100,Pass,---,0,ERROR
27-
RE_DATA_METRICS,---,_buy_events___3,Pass,---,0,ERROR
2829
BUY_EVENTS,VALUE1,__nulls_percent,Pass,---,0,ERROR
30+
RE_DATA_METRICS,---,_buy_events___3,Pass,---,0,ERROR
2931
RE_DATA_METRICS,---,ref_buy_events_,Pass,---,0,ERROR
3032
RE_DATA_METRICS,---,ref_buy_events_,Pass,---,0,ERROR
31-
TEST_RE_DATA_TABLE_SAMPLES,---,_table_samples_,Pass,---,0,ERROR
3233
RE_DATA_METRICS,---,ref_buy_events_,Pass,---,0,ERROR
33-
TEST_RE_DATA_ANOMALIES,---,cted_anomalies_,Pass,---,0,ERROR
34-
TEST_RE_DATA_Z_SCORE,---,pected_z_score_,Pass,---,0,ERROR
3534
TEST_RE_DATA_METRICS,---,pected_metrics_,Pass,---,0,ERROR
35+
TEST_RE_DATA_Z_SCORE,---,pected_z_score_,Pass,---,0,ERROR

‎macros/tests/test_metrics.sql‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,73 +33,73 @@
3333

3434
{# new test macros #}
3535

36-
{% test assert_true(model, column_name=None, metric=None, expression=expression, where=None) %}
36+
{% test assert_true(model, column_name=None, metric=None, expression=expression, condition=None) %}
3737
-- depends_on: {{ ref('re_data_base_metrics') }}
3838
{% if execute %}
39-
{{ re_data.metric_expression(model, metric, expression, column_name, where) }}
39+
{{ re_data.metric_expression(model, metric, expression, column_name, condition) }}
4040
{% else %}
4141
{{ re_data.empty_table() }}
4242
{% endif %}
4343
{% endtest %}
4444

45-
{% test assert_false(model, column_name=None, metric=None, expression=expression, where=None) %}
45+
{% test assert_false(model, column_name=None, metric=None, expression=expression, condition=None) %}
4646
-- depends_on: {{ ref('re_data_base_metrics') }}
4747
{% if execute %}
48-
{{ re_data.metric_expression(model, metric, 'not (' ~ expression ~ ')', column_name, where) }}
48+
{{ re_data.metric_expression(model, metric, 'not (' ~ expression ~ ')', column_name, condition) }}
4949
{% else %}
5050
{{ re_data.empty_table() }}
5151
{% endif %}
5252
{% endtest %}
5353

54-
{% test assert_in_range(model, column_name=None, metric=None, min_value=None, max_value=None, where=None) %}
54+
{% test assert_in_range(model, column_name=None, metric=None, min_value=None, max_value=None, condition=None) %}
5555
-- depends_on: {{ ref('re_data_base_metrics') }}
5656
{% if execute %}
57-
{{ re_data.metric_expression(model, metric, 'value >= ' ~ min_value ~ ' and value <= ' ~ max_value, column_name, where) }}
57+
{{ re_data.metric_expression(model, metric, 'value >= ' ~ min_value ~ ' and value <= ' ~ max_value, column_name, condition) }}
5858
{% else %}
5959
{{ re_data.empty_table() }}
6060
{% endif %}
6161
{% endtest %}
6262

63-
{% test assert_equal(model, column_name=None, metric=None, value=value, where=None) %}
63+
{% test assert_equal(model, column_name=None, metric=None, value=value, condition=None) %}
6464
-- depends_on: {{ ref('re_data_base_metrics') }}
6565
{% if execute %}
66-
{{ re_data.metric_expression(model, metric, 'value = ' ~ value, column_name, where) }}
66+
{{ re_data.metric_expression(model, metric, 'value = ' ~ value, column_name, condition) }}
6767
{% else %}
6868
{{ re_data.empty_table() }}
6969
{% endif %}
7070
{% endtest %}
7171

72-
{% test assert_greater(model, column_name=None, metric=None, value=None, where=None) %}
72+
{% test assert_greater(model, column_name=None, metric=None, value=None, condition=None) %}
7373
-- depends_on: {{ ref('re_data_base_metrics') }}
7474
{% if execute %}
75-
{{ re_data.metric_expression(model, metric, 'value > ' ~ value, column_name, where) }}
75+
{{ re_data.metric_expression(model, metric, 'value > ' ~ value, column_name, condition) }}
7676
{% else %}
7777
{{ re_data.empty_table() }}
7878
{% endif %}
7979
{% endtest %}
8080

81-
{% test assert_greater_equal(model, column_name=None, metric=None, value=None, where=None) %}
81+
{% test assert_greater_equal(model, column_name=None, metric=None, value=None, condition=None) %}
8282
-- depends_on: {{ ref('re_data_base_metrics') }}
8383
{% if execute %}
84-
{{ re_data.metric_expression(model, metric, 'value >= ' ~ value, column_name, where) }}
84+
{{ re_data.metric_expression(model, metric, 'value >= ' ~ value, column_name, condition) }}
8585
{% else %}
8686
{{ re_data.empty_table() }}
8787
{% endif %}
8888
{% endtest %}
8989

90-
{% test assert_less(model, column_name=None, metric=None, value=None, where=None) %}
90+
{% test assert_less(model, column_name=None, metric=None, value=None, condition=None) %}
9191
-- depends_on: {{ ref('re_data_base_metrics') }}
9292
{% if execute %}
93-
{{ re_data.metric_expression(model, metric, 'value < ' ~ value, column_name, where) }}
93+
{{ re_data.metric_expression(model, metric, 'value < ' ~ value, column_name, condition) }}
9494
{% else %}
9595
{{ re_data.empty_table() }}
9696
{% endif %}
9797
{% endtest %}
9898

99-
{% test assert_less_equal(model, column_name=None, metric=None, value=None, where=None) %}
99+
{% test assert_less_equal(model, column_name=None, metric=None, value=None, condition=None) %}
100100
-- depends_on: {{ ref('re_data_base_metrics') }}
101101
{% if execute %}
102-
{{ re_data.metric_expression(model, metric, 'value <= ' ~ value, column_name, where) }}
102+
{{ re_data.metric_expression(model, metric, 'value <= ' ~ value, column_name, condition) }}
103103
{% else %}
104104
{{ re_data.empty_table() }}
105105
{% endif %}

0 commit comments

Comments
 (0)