Skip to content

Commit a4f2a82

Browse files
b-perb-per
committed
Rename macro to avoid recursive errors
1 parent 14c3c71 commit a4f2a82

12 files changed

Lines changed: 84 additions & 84 deletions

‎macros/cross_db_shim/type_string.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{%- macro type_string() -%}
2-
{{ return(adapter.dispatch('type_string', 'dbt_project_evaluator')()) }}
1+
{%- macro type_string_dpe() -%}
2+
{{ return(adapter.dispatch('type_string_dpe', 'dbt_project_evaluator')()) }}
33
{%- endmacro -%}
44

5-
{%- macro default__type_string() -%}
5+
{%- macro default__type_string_dpe() -%}
66
{{ return(dbt.type_string()) }}
77
{%- endmacro -%}
88

9-
{%- macro redshift__type_string() -%}
9+
{%- macro redshift__type_string_dpe() -%}
1010
{{ return(api.Column.string_type(600)) }}
1111
{%- endmacro -%}

‎macros/unpack/get_relationship_values.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
{%- set values_line =
2525
[
26-
"cast('" ~ node.unique_id ~ "' as " ~ dbt_project_evaluator.type_string() ~ ")",
27-
"cast(NULL as " ~ dbt_project_evaluator.type_string() ~ ")",
26+
"cast('" ~ node.unique_id ~ "' as " ~ dbt_project_evaluator.type_string_dpe() ~ ")",
27+
"cast(NULL as " ~ dbt_project_evaluator.type_string_dpe() ~ ")",
2828
"FALSE",
2929
]
3030
%}
@@ -37,8 +37,8 @@
3737

3838
{%- set values_line =
3939
[
40-
"cast('" ~ node.unique_id ~ "' as " ~ dbt_project_evaluator.type_string() ~ ")",
41-
"cast('" ~ parent ~ "' as " ~ dbt_project_evaluator.type_string() ~ ")",
40+
"cast('" ~ node.unique_id ~ "' as " ~ dbt_project_evaluator.type_string_dpe() ~ ")",
41+
"cast('" ~ parent ~ "' as " ~ dbt_project_evaluator.type_string_dpe() ~ ")",
4242
"" ~ loop.last ~ "" if node.unique_id.split('.')[0] == 'test' else "FALSE"
4343
]
4444
%}

‎macros/wrap_string_with_quotes.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% macro wrap_string_with_quotes(str) %}
22
{% if str is none %}
3-
{{ return('cast(NULL as ' ~ dbt_project_evaluator.type_string() ~ ')') }}
3+
{{ return('cast(NULL as ' ~ dbt_project_evaluator.type_string_dpe() ~ ')') }}
44
{% else %}
55
{{ dbt.string_literal(str) }}
66
{% endif %}

‎models/staging/graph/base/base_exposure_relationships.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ with dummy_cte as (
1515
)
1616

1717
select
18-
cast(null as {{ dbt_project_evaluator.type_string()}}) as resource_id,
19-
cast(null as {{ dbt_project_evaluator.type_string()}}) as direct_parent_id,
18+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as resource_id,
19+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as direct_parent_id,
2020
cast(True as boolean) as is_primary_relationship
2121

2222
from dummy_cte

‎models/staging/graph/base/base_metric_relationships.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ with dummy_cte as (
1515
)
1616

1717
select
18-
cast(null as {{ dbt_project_evaluator.type_string()}}) as resource_id,
19-
cast(null as {{ dbt_project_evaluator.type_string()}}) as direct_parent_id,
18+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as resource_id,
19+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as direct_parent_id,
2020
cast(True as boolean) as is_primary_relationship
2121

2222
from dummy_cte

‎models/staging/graph/base/base_node_columns.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ with dummy_cte as (
1414
)
1515

1616
select
17-
cast(null as {{ dbt_project_evaluator.type_string() }}) as node_unique_id,
18-
cast(null as {{ dbt_project_evaluator.type_string()}}) as name,
17+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as node_unique_id,
18+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as name,
1919
cast(null as {{ dbt_project_evaluator.type_large_string()}}) as description,
20-
cast(null as {{ dbt_project_evaluator.type_string()}}) as data_type,
21-
cast(null as {{ dbt_project_evaluator.type_string()}}) as constraints,
20+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as data_type,
21+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as constraints,
2222
cast(True as boolean) as has_not_null_constraint,
2323
cast(0 as {{ dbt.type_int() }}) as constraints_count,
24-
cast(null as {{ dbt_project_evaluator.type_string()}}) as quote
24+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as quote
2525

2626
from dummy_cte
2727
where false

‎models/staging/graph/base/base_node_relationships.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ with dummy_cte as (
1414
)
1515

1616
select
17-
cast(null as {{ dbt_project_evaluator.type_string()}}) as resource_id,
18-
cast(null as {{ dbt_project_evaluator.type_string()}}) as direct_parent_id,
17+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as resource_id,
18+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as direct_parent_id,
1919
cast(True as boolean) as is_primary_relationship
2020

2121
from dummy_cte

‎models/staging/graph/base/base_source_columns.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ with dummy_cte as (
1414
)
1515

1616
select
17-
cast(null as {{ dbt_project_evaluator.type_string() }}) as node_unique_id,
18-
cast(null as {{ dbt_project_evaluator.type_string()}}) as name,
17+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as node_unique_id,
18+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as name,
1919
cast(null as {{ dbt_project_evaluator.type_large_string()}}) as description,
20-
cast(null as {{ dbt_project_evaluator.type_string()}}) as data_type,
21-
cast(null as {{ dbt_project_evaluator.type_string()}}) as constraints,
20+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as data_type,
21+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as constraints,
2222
cast(True as boolean) as has_not_null_constraint,
2323
cast(0 as {{ dbt.type_int() }}) as constraints_count,
24-
cast(null as {{ dbt_project_evaluator.type_string()}}) as quote
24+
cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as quote
2525

2626
from dummy_cte
2727
where false

‎models/staging/graph/stg_exposures.sql‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ with dummy_cte as (
1515

1616
select
1717

18-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as unique_id,
19-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as name,
20-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as resource_type,
21-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as file_path,
18+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as unique_id,
19+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as name,
20+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as resource_type,
21+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as file_path,
2222
cast(True as boolean) as is_described,
23-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as exposure_type,
24-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as maturity,
25-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as package_name,
26-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as url,
27-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as owner_name,
28-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as owner_email,
29-
cast(null as {{ dbt_project_evaluator.type_string() }} ) as meta
23+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as exposure_type,
24+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as maturity,
25+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as package_name,
26+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as url,
27+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as owner_name,
28+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as owner_email,
29+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }} ) as meta
3030

3131
from dummy_cte
3232
where false

‎models/staging/graph/stg_metrics.sql‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ with dummy_cte as (
1515

1616
select
1717

18-
cast(null as {{ dbt_project_evaluator.type_string() }}) as unique_id,
19-
cast(null as {{ dbt_project_evaluator.type_string() }}) as name,
20-
cast(null as {{ dbt_project_evaluator.type_string() }}) as resource_type,
21-
cast(null as {{ dbt_project_evaluator.type_string() }}) as file_path,
18+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as unique_id,
19+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as name,
20+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as resource_type,
21+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as file_path,
2222
cast(True as boolean) as is_described,
23-
cast(null as {{ dbt_project_evaluator.type_string() }}) as metric_type,
24-
cast(null as {{ dbt_project_evaluator.type_string() }}) as label,
25-
cast(null as {{ dbt_project_evaluator.type_string() }}) as package_name,
26-
cast(null as {{ dbt_project_evaluator.type_string() }}) as metric_filter,
27-
cast(null as {{ dbt_project_evaluator.type_string() }}) as metric_measure,
28-
cast(null as {{ dbt_project_evaluator.type_string() }}) as metric_measure_alias,
29-
cast(null as {{ dbt_project_evaluator.type_string() }}) as numerator,
30-
cast(null as {{ dbt_project_evaluator.type_string() }}) as denominator,
31-
cast(null as {{ dbt_project_evaluator.type_string() }}) as expr,
32-
cast(null as {{ dbt_project_evaluator.type_string() }}) as metric_window,
33-
cast(null as {{ dbt_project_evaluator.type_string() }}) as grain_to_date,
34-
cast(null as {{ dbt_project_evaluator.type_string() }}) as meta
23+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as metric_type,
24+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as label,
25+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as package_name,
26+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as metric_filter,
27+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as metric_measure,
28+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as metric_measure_alias,
29+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as numerator,
30+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as denominator,
31+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as expr,
32+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as metric_window,
33+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as grain_to_date,
34+
cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as meta
3535

3636
from dummy_cte
3737
where false

0 commit comments

Comments
 (0)