Update function macros to use correct function property names (#1366)

Author: QMalcolm

dbt-adapters/.changes/unreleased/Fixes-20251002-115032.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix referenced function property names in function macros
+time: 2025-10-02T11:50:32.228639-05:00
+custom:
+  Author: QMalcolm
+  Issue: "1365"

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

@@ -12,7 +12,9 @@
 {% endmacro %}
 
 {% macro default__scalar_function_create_replace_signature_sql(target_relation) %}
-    CREATE OR REPLACE FUNCTION {{ target_relation.render() }} ({{ formatted_scalar_function_args_sql()}}) RETURNS {{ model.return_type.type }} AS
+    CREATE OR REPLACE FUNCTION {{ target_relation.render() }} ({{ formatted_scalar_function_args_sql()}})
+    RETURNS {{ model.returns.data_type }}
+    AS
 {% endmacro %}
 
 {% macro formatted_scalar_function_args_sql() %}
@@ -22,7 +24,7 @@
 {% macro default__formatted_scalar_function_args_sql() %}
     {% set args = [] %}
     {% for arg in model.arguments -%}
-        {%- do args.append(arg.name ~ ' ' ~ arg.type) -%}
+        {%- do args.append(arg.name ~ ' ' ~ arg.data_type) -%}
     {%- endfor %}
     {{ args | join(', ') }}
 {% endmacro %}

dbt-bigquery/.changes/unreleased/Fixes-20251002-121022.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix references to function properties in function macros
+time: 2025-10-02T12:10:22.720046-05:00
+custom:
+  Author: QMalcolm
+  Issue: "1365"

dbt-bigquery/src/dbt/include/bigquery/macros/materializations/functions/scalar.sql

@@ -1,6 +1,6 @@
 {% macro bigquery__scalar_function_create_replace_signature_sql(target_relation) %}
     CREATE OR REPLACE FUNCTION {{ target_relation.render() }} ({{ formatted_scalar_function_args_sql()}})
-    RETURNS {{ model.return_type.type }}
+    RETURNS {{ model.returns.data_type }}
     AS
 {% endmacro %}
 

dbt-bigquery/tests/functional/functions/files.py

@@ -8,9 +8,9 @@
     description: Calculate the price for the xlarge version of a standard item
     arguments:
       - name: price
-        type: numeric
+        data_type: numeric
         description: The price of the standard item
-    return_type:
-      type: numeric
+    returns:
+      data_type: numeric
       description: The resulting xlarge price
 """

dbt-redshift/.changes/unreleased/Fixes-20251002-120929.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix references to function properties in function macros
+time: 2025-10-02T12:09:29.303025-05:00
+custom:
+  Author: QMalcolm
+  Issue: "1365"

dbt-redshift/src/dbt/include/redshift/macros/materializations/functions/scalar.sql

@@ -1,6 +1,6 @@
 {% macro redshift__scalar_function_create_replace_signature_sql(target_relation) %}
     CREATE OR REPLACE FUNCTION {{ target_relation.render() }} ({{ formatted_scalar_function_args_sql()}})
-        RETURNS {{ model.return_type.type }}
+        RETURNS {{ model.returns.data_type }}
     {# TODO: Stop defaulting to VOLATILE once we have a way to set the volatility #}
     {# We set a default here because redshift requires a volatility to be set #}
     VOLATILE
@@ -10,7 +10,7 @@
 {% macro redshift__formatted_scalar_function_args_sql() %}
     {% set args = [] %}
     {% for arg in model.arguments -%}
-        {%- do args.append(arg.type) -%}
+        {%- do args.append(arg.data_type) -%}
     {%- endfor %}
     {{ args | join(', ') }}
 {% endmacro %}

dbt-snowflake/.changes/unreleased/Fixes-20251002-120639.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix references to function properties in funciton macros
+time: 2025-10-02T12:06:39.049296-05:00
+custom:
+  Author: QMalcolm
+  Issue: "1365"

dbt-snowflake/src/dbt/include/snowflake/macros/materializations/functions/scalar.sql

@@ -1,6 +1,6 @@
 {% macro snowflake__scalar_function_create_replace_signature_sql(target_relation) %}
     CREATE OR REPLACE FUNCTION {{ target_relation.render() }} ({{ formatted_scalar_function_args_sql()}})
-    RETURNS {{ model.return_type.type }}
+    RETURNS {{ model.returns.data_type }}
     LANGUAGE SQL
     AS
 {% endmacro %}

dbt-tests-adapter/.changes/unreleased/Fixes-20251002-115259.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix file fixtures for functions to use proper function property names
+time: 2025-10-02T11:52:59.273372-05:00
+custom:
+  Author: QMalcolm
+  Issue: "1365"