Skip to content

Commit 7a17578

Browse files
graciegoheengraciegoheen
committed
use generate_surrogate_key macro instead of ||
1 parent 0281a2a commit 7a17578

6 files changed

+51
-51
lines changed

‎integration_tests/models/compare_all_columns_concat_pk_with_summary.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
{{ audit_helper.compare_all_columns(
66
a_relation=a_relation,
77
b_relation=b_relation,
8-
primary_key="produce_category||id"
8+
primary_key=dbt_utils.generate_surrogate_key(['produce_category', 'id'])
99
) }}

‎integration_tests/models/compare_all_columns_concat_pk_without_summary.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
{{ audit_helper.compare_all_columns(
66
a_relation=a_relation,
77
b_relation=b_relation,
8-
primary_key="produce_category||id",
8+
primary_key=dbt_utils.generate_surrogate_key(['produce_category', 'id']),
99
summarize=false
1010
) }}

‎integration_tests/models/compare_queries_concat_pk_without_summary.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
{{ audit_helper.compare_queries(
1010
a_query=a_query,
1111
b_query=b_query,
12-
primary_key="col_a||col_b",
12+
primary_key=dbt_utils.generate_surrogate_key(['col_a', 'col_b']),
1313
summarize=false
1414
) }}

‎integration_tests/models/compare_relations_concat_pk_without_summary.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
{{ audit_helper.compare_relations(
66
a_relation=a_relation,
77
b_relation=b_relation,
8-
primary_key="col_a||col_b",
8+
primary_key=dbt_utils.generate_surrogate_key(['col_a', 'col_b']),
99
summarize=false
1010
) }}

‎integration_tests/models/schema.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ models:
66
- dbt_utils.equality:
77
compare_model: ref('expected_results__compare_relations_without_exclude')
88

9-
- name: compare_queries_concat_pk_as_primary_key_without_summary
9+
- name: compare_queries_concat_pk_without_summary
1010
tests:
1111
- dbt_utils.equality:
1212
compare_model: ref('expected_results__compare_without_summary')
@@ -51,12 +51,12 @@ models:
5151
- dbt_utils.equality:
5252
compare_model: ref('expected_results__compare_all_columns_without_summary')
5353

54-
- name: compare_all_columns_concat_pk_as_primary_key_with_summary
54+
- name: compare_all_columns_concat_pk_with_summary
5555
tests:
5656
- dbt_utils.equality:
5757
compare_model: ref('expected_results__compare_all_columns_concat_pk_with_summary')
5858

59-
- name: compare_all_columns_concat_pk_as_primary_key_without_summary
59+
- name: compare_all_columns_concat_pk_without_summary
6060
tests:
6161
- dbt_utils.equality:
6262
compare_model: ref('expected_results__compare_all_columns_concat_pk_without_summary')

‎integration_tests/seeds/expected_results__compare_all_columns_concat_pk_without_summary.csv

+44-44
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
primary_key,column_name,perfect_match,null_in_a,null_in_b,missing_from_a,missing_from_b,conflicting_values
2-
fruit1,produce_category,true,false,false,false,false,false
3-
fruit1,ripeness,true,false,false,false,false,false
4-
fruit1,produce,true,false,false,false,false,false
5-
fruit1,id,true,false,false,false,false,false
6-
fruit10,id,false,false,false,true,false,false
7-
fruit10,produce,false,false,false,true,false,false
8-
fruit10,ripeness,false,false,true,true,false,false
9-
fruit10,produce_category,false,false,false,true,false,false
10-
fruit2,ripeness,false,false,false,false,false,true
11-
fruit2,id,true,false,false,false,false,false
12-
fruit2,produce,true,false,false,false,false,false
13-
fruit2,produce_category,true,false,false,false,false,false
14-
fruit3,ripeness,true,false,false,false,false,false
15-
fruit3,produce,true,false,false,false,false,false
16-
fruit3,produce_category,true,false,false,false,false,false
17-
fruit3,id,true,false,false,false,false,false
18-
fruit4,ripeness,true,false,false,false,false,false
19-
fruit4,produce_category,true,false,false,false,false,false
20-
fruit4,id,true,false,false,false,false,false
21-
fruit4,produce,true,false,false,false,false,false
22-
fruit5,produce,true,false,false,false,false,false
23-
fruit5,produce_category,true,false,false,false,false,false
24-
fruit5,ripeness,true,false,false,false,false,false
25-
fruit5,id,true,false,false,false,false,false
26-
fruit6,id,true,false,false,false,false,false
27-
fruit6,ripeness,true,false,false,false,false,false
28-
fruit6,produce_category,true,false,false,false,false,false
29-
fruit6,produce,false,false,true,false,false,true
30-
fruit7,id,true,false,false,false,false,false
31-
fruit7,produce,true,false,false,false,false,false
32-
fruit7,ripeness,false,true,false,false,false,true
33-
fruit7,produce_category,true,false,false,false,false,false
34-
fruit8,ripeness,false,false,false,false,true,false
35-
fruit8,produce,false,false,false,false,true,false
36-
fruit8,id,false,false,false,false,true,false
37-
fruit8,produce_category,false,false,false,false,true,false
38-
fruit9,produce,false,false,false,true,false,false
39-
fruit9,id,false,false,false,true,false,false
40-
fruit9,ripeness,false,false,false,true,false,false
41-
fruit9,produce_category,false,false,false,true,false,false
42-
vegetable1,ripeness,true,false,false,false,false,false
43-
vegetable1,produce,true,false,false,false,false,false
44-
vegetable1,id,true,false,false,false,false,false
45-
vegetable1,produce_category,true,false,false,false,false,false
2+
00f0200cfb8e8443dfa3566bd60170a7,PRODUCE_CATEGORY,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
3+
00f0200cfb8e8443dfa3566bd60170a7,PRODUCE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
4+
00f0200cfb8e8443dfa3566bd60170a7,ID,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
5+
00f0200cfb8e8443dfa3566bd60170a7,RIPENESS,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
6+
0262eff11e473d76cf5e71ba1bb9adde,ID,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE
7+
0262eff11e473d76cf5e71ba1bb9adde,PRODUCE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE
8+
0262eff11e473d76cf5e71ba1bb9adde,PRODUCE_CATEGORY,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE
9+
0262eff11e473d76cf5e71ba1bb9adde,RIPENESS,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE
10+
231ee7461c22557b0b811bc510df9c3f,PRODUCE_CATEGORY,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE
11+
231ee7461c22557b0b811bc510df9c3f,PRODUCE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE
12+
231ee7461c22557b0b811bc510df9c3f,RIPENESS,FALSE,FALSE,TRUE,TRUE,FALSE,FALSE
13+
231ee7461c22557b0b811bc510df9c3f,ID,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE
14+
51f71ec6b715b6071a0b6a9647bce8a7,PRODUCE_CATEGORY,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
15+
51f71ec6b715b6071a0b6a9647bce8a7,RIPENESS,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
16+
51f71ec6b715b6071a0b6a9647bce8a7,PRODUCE,FALSE,FALSE,TRUE,FALSE,FALSE,TRUE
17+
51f71ec6b715b6071a0b6a9647bce8a7,ID,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
18+
559c0b59e42ff35a37de91977b660800,RIPENESS,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
19+
559c0b59e42ff35a37de91977b660800,PRODUCE_CATEGORY,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
20+
559c0b59e42ff35a37de91977b660800,PRODUCE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
21+
559c0b59e42ff35a37de91977b660800,ID,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
22+
5f3bd1bba6beca5a23d4cde34a9bd96b,RIPENESS,FALSE,TRUE,FALSE,FALSE,FALSE,TRUE
23+
5f3bd1bba6beca5a23d4cde34a9bd96b,PRODUCE_CATEGORY,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
24+
5f3bd1bba6beca5a23d4cde34a9bd96b,ID,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
25+
5f3bd1bba6beca5a23d4cde34a9bd96b,PRODUCE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
26+
a971c9a048ccd0fd4d282cc2a55734bc,PRODUCE_CATEGORY,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE
27+
a971c9a048ccd0fd4d282cc2a55734bc,RIPENESS,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE
28+
a971c9a048ccd0fd4d282cc2a55734bc,PRODUCE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE
29+
a971c9a048ccd0fd4d282cc2a55734bc,ID,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE
30+
bd483dcfa375c6fd78c89072de1eea20,PRODUCE_CATEGORY,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
31+
bd483dcfa375c6fd78c89072de1eea20,PRODUCE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
32+
bd483dcfa375c6fd78c89072de1eea20,ID,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
33+
bd483dcfa375c6fd78c89072de1eea20,RIPENESS,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
34+
cfd3543ee591403d825bf0a1618b1709,ID,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
35+
cfd3543ee591403d825bf0a1618b1709,PRODUCE_CATEGORY,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
36+
cfd3543ee591403d825bf0a1618b1709,RIPENESS,FALSE,FALSE,FALSE,FALSE,FALSE,TRUE
37+
cfd3543ee591403d825bf0a1618b1709,PRODUCE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
38+
eae3b305c437133aebdd66788f38e262,ID,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
39+
eae3b305c437133aebdd66788f38e262,RIPENESS,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
40+
eae3b305c437133aebdd66788f38e262,PRODUCE_CATEGORY,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
41+
eae3b305c437133aebdd66788f38e262,PRODUCE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
42+
f2448f021cb149747e9ada2531d5116d,PRODUCE_CATEGORY,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
43+
f2448f021cb149747e9ada2531d5116d,RIPENESS,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
44+
f2448f021cb149747e9ada2531d5116d,PRODUCE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
45+
f2448f021cb149747e9ada2531d5116d,ID,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE

0 commit comments

Comments
 (0)