Skip to content

Commit c1e9976

Browse files
authored
Update function materialization related macros to use default__ naming scheme (#1357)
1 parent 7950fca commit c1e9976

File tree

3 files changed

+38
-8
lines changed

3 files changed

+38
-8
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
kind: Fixes
2+
body: Update function related global macros to use `default__` naming scheme
3+
time: 2025-09-26T15:27:57.488721-05:00
4+
custom:
5+
Author: QMalcolm
6+
Issue: "1356"

dbt-adapters/src/dbt/include/global_project/macros/materializations/functions/helpers.sql

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
{% macro function_execute_build_sql(build_sql, existing_relation, target_relation) %}
2+
{{ return(adapter.dispatch('function_execute_build_sql', 'dbt')(build_sql, existing_relation, target_relation)) }}
3+
{% endmacro %}
4+
5+
{% macro default__function_execute_build_sql(build_sql, existing_relation, target_relation) %}
26

37
{% set grant_config = config.get('grants') %}
48

@@ -17,7 +21,11 @@
1721

1822

1923
{% macro get_function_macro(function_type, function_language) %}
20-
{% set macro_name = "get_" ~ function_type ~ "_function_" ~ function_language %}
24+
{{ return(adapter.dispatch('get_function_macro', 'dbt')(function_type, function_language)) }}
25+
{% endmacro %}
26+
27+
{% macro default__get_function_macro(function_type, function_language) %}
28+
{% set macro_name = function_type ~ "_function_" ~ function_language %}
2129
{% if not macro_name in context %}
2230
{{ exceptions.raise_not_implemented(function_language ~ ' ' ~ function_type ~ ' function not implemented for adapter ' ~adapter.type()) }}
2331
{% endif %}

dbt-adapters/src/dbt/include/global_project/macros/materializations/functions/scalar.sql

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,37 @@
1-
{% macro get_scalar_function_sql(target_relation) %}
2-
{{ get_scalar_function_create_replace_signature(target_relation) }}
3-
{{ get_scalar_function_body() }};
1+
{% macro scalar_function_sql(target_relation) %}
2+
{{ return(adapter.dispatch('scalar_function_sql', 'dbt')(target_relation)) }}
43
{% endmacro %}
54

6-
{% macro get_scalar_function_create_replace_signature(target_relation) %}
7-
CREATE OR REPLACE FUNCTION {{ target_relation.render() }} ({{ get_formatted_scalar_function_args()}}) RETURNS {{ model.return_type.type }} AS
5+
{% macro default__scalar_function_sql(target_relation) %}
6+
{{ scalar_function_create_replace_signature_sql(target_relation) }}
7+
{{ scalar_function_body_sql() }};
88
{% endmacro %}
99

10-
{% macro get_formatted_scalar_function_args() %}
10+
{% macro scalar_function_create_replace_signature_sql(target_relation) %}
11+
{{ return(adapter.dispatch('scalar_function_create_replace_signature_sql', 'dbt')(target_relation)) }}
12+
{% endmacro %}
13+
14+
{% macro default__scalar_function_create_replace_signature_sql(target_relation) %}
15+
CREATE OR REPLACE FUNCTION {{ target_relation.render() }} ({{ formatted_scalar_function_args_sql()}}) RETURNS {{ model.return_type.type }} AS
16+
{% endmacro %}
17+
18+
{% macro formatted_scalar_function_args_sql() %}
19+
{{ return(adapter.dispatch('formatted_scalar_function_args_sql', 'dbt')()) }}
20+
{% endmacro %}
21+
22+
{% macro default__formatted_scalar_function_args_sql() %}
1123
{% set args = [] %}
1224
{% for arg in model.arguments -%}
1325
{%- do args.append(arg.name ~ ' ' ~ arg.type) -%}
1426
{%- endfor %}
1527
{{ args | join(', ') }}
1628
{% endmacro %}
1729

18-
{% macro get_scalar_function_body() %}
30+
{% macro scalar_function_body_sql() %}
31+
{{ return(adapter.dispatch('scalar_function_body_sql', 'dbt')()) }}
32+
{% endmacro %}
33+
34+
{% macro default__scalar_function_body_sql() %}
1935
$$
2036
{{ model.compiled_code }}
2137
$$ LANGUAGE SQL;

0 commit comments

Comments
 (0)