Merge branch 'main' into RRap0so/make-bigquery-temp-tbls-unique

RRap0so · web-flow · commit 095055cd0477 · 2025-10-03T06:42:16.000+02:00
diff --git a/dbt-adapters/.changes/1.17.1.md b/dbt-adapters/.changes/1.17.1.md
@@ -0,0 +1,5 @@
+## dbt-adapters 1.17.1 - October 01, 2025
+
+### Fixes
+
+- Drop extraneous `;` from scalar function macro ([#N/A](https://github.com/dbt-labs/dbt-adapters/issues/N/A))
diff --git a/dbt-adapters/.changes/1.17.2.md b/dbt-adapters/.changes/1.17.2.md
@@ -0,0 +1,5 @@
+## dbt-adapters 1.17.2 - October 02, 2025
+
+### Fixes
+
+- Fix referenced function property names in function macros ([#1365](https://github.com/dbt-labs/dbt-adapters/issues/1365))
diff --git a/dbt-adapters/CHANGELOG.md b/dbt-adapters/CHANGELOG.md
@@ -10,6 +10,20 @@ and is generated by [Changie](https://github.com/miniscruff/changie)
 - Do not edit this file directly. This file is auto-generated using [changie](https://github.com/miniscruff/changie)
 - For details on how to document a change, see the [contributing guide](/CONTRIBUTING.md#changelog-entry)
 
+## dbt-adapters 1.17.2 - October 02, 2025
+
+### Fixes
+
+- Fix referenced function property names in function macros ([#1365](https://github.com/dbt-labs/dbt-adapters/issues/1365))
+
+
+
+## dbt-adapters 1.17.1 - October 01, 2025
+
+### Fixes
+
+- Drop extraneous `;` from scalar function macro ([#N/A](https://github.com/dbt-labs/dbt-adapters/issues/N/A))
+
 ## dbt-adapters 1.17.0 - September 29, 2025
 
 ### Features
@@ -24,7 +38,6 @@ and is generated by [Changie](https://github.com/miniscruff/changie)
 ### Contributors
 - [@jeremyyeo](https://github.com/jeremyyeo) ([#1240](https://github.com/dbt-labs/dbt-adapters/issues/1240))
 
-
 ## dbt-adapters 1.16.6 - September 03, 2025
 
 ### Under the Hood
diff --git a/dbt-adapters/src/dbt/adapters/__about__.py b/dbt-adapters/src/dbt/adapters/__about__.py
@@ -1 +1 @@
-version = "1.17.0"
+version = "1.17.2"
diff --git a/dbt-adapters/src/dbt/include/global_project/macros/materializations/functions/scalar.sql b/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 %}
@@ -34,5 +36,5 @@
 {% macro default__scalar_function_body_sql() %}
     $$
        {{ model.compiled_code }}
-    $$ LANGUAGE SQL;
+    $$ LANGUAGE SQL
 {% endmacro %}
diff --git a/dbt-bigquery/.changes/unreleased/Features-20250929-144206.yaml b/dbt-bigquery/.changes/unreleased/Features-20250929-144206.yaml
@@ -0,0 +1,6 @@
+kind: Features
+body: Add support for scalar functions
+time: 2025-09-29T14:42:06.039751-05:00
+custom:
+  Author: QMalcolm
+  Issue: "1290"
diff --git a/dbt-bigquery/.changes/unreleased/Fixes-20250915-095308.yaml b/dbt-bigquery/.changes/unreleased/Fixes-20250915-095308.yaml
@@ -0,0 +1,7 @@
+kind: Fixes
+body: Ensure we have exchanged a refresh-token for a token prior to detemining notebook
+  user in BigFrames
+time: 2025-09-15T09:53:08.063964-07:00
+custom:
+  Author: colin-rogers-dbt
+  Issue: "1219"
diff --git a/dbt-bigquery/.changes/unreleased/Fixes-20251002-121022.yaml b/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"
diff --git a/dbt-bigquery/src/dbt/adapters/bigquery/python_submissions.py b/dbt-bigquery/src/dbt/adapters/bigquery/python_submissions.py
@@ -216,6 +216,18 @@ def __init__(self, parsed_model: Dict, credentials: BigQueryCredentials) -> None
             model_timeout=parsed_model["config"].get("timeout") or _DEFAULT_BIGFRAMES_TIMEOUT
         )
 
+    def _get_token(self) -> str:
+        """Get a token from the credentials.
+        If a token is not supplied by the user directly it is lazily created the first time we authenticates.
+        BigFrames needs a token to determine the execution user but a call may not have
+        """
+        creds = self._GoogleCredentials
+        if creds.token:
+            return creds.token
+        else:
+            creds.refresh()
+            return creds.token
+
     def _py_to_ipynb(self, compiled_code: str) -> str:
         notebook = nbformat.v4.new_notebook()
         # Put all codes in one cell.
@@ -332,7 +344,7 @@ def _config_notebook_job(
                 response = request(
                     method="GET",
                     url="https://www.googleapis.com/oauth2/v2/userinfo",
-                    headers={"Authorization": f"Bearer {self._GoogleCredentials.token}"},
+                    headers={"Authorization": f"Bearer {self._get_token()}"},
                 )
 
                 if response.status != 200:
diff --git a/dbt-bigquery/src/dbt/include/bigquery/macros/materializations/functions/scalar.sql b/dbt-bigquery/src/dbt/include/bigquery/macros/materializations/functions/scalar.sql
@@ -0,0 +1,11 @@
+{% macro bigquery__scalar_function_create_replace_signature_sql(target_relation) %}
+    CREATE OR REPLACE FUNCTION {{ target_relation.render() }} ({{ formatted_scalar_function_args_sql()}})
+    RETURNS {{ model.returns.data_type }}
+    AS
+{% endmacro %}
+
+{% macro bigquery__scalar_function_body_sql() %}
+    (
+       {{ model.compiled_code }}
+    )
+{% endmacro %}
diff --git a/dbt-bigquery/tests/functional/functions/files.py b/dbt-bigquery/tests/functional/functions/files.py
@@ -0,0 +1,16 @@
+MY_UDF_SQL = """
+price * 2
+""".strip()
+
+MY_UDF_YML = """
+functions:
+  - name: price_for_xlarge
+    description: Calculate the price for the xlarge version of a standard item
+    arguments:
+      - name: price
+        data_type: numeric
+        description: The price of the standard item
+    returns:
+      data_type: numeric
+      description: The resulting xlarge price
+"""
diff --git a/dbt-bigquery/tests/functional/functions/test_udfs.py b/dbt-bigquery/tests/functional/functions/test_udfs.py
@@ -0,0 +1,15 @@
+import pytest
+from dbt.tests.adapter.functions.test_udfs import UDFsBasic
+from tests.functional.functions import files
+
+
+class TestBigqueryUDFs(UDFsBasic):
+
+    @pytest.fixture(scope="class")
+    def functions(self):
+        return {
+            "price_for_xlarge.sql": files.MY_UDF_SQL,
+            "price_for_xlarge.yml": files.MY_UDF_YML,
+        }
+
+    pass
diff --git a/dbt-redshift/.changes/unreleased/Features-20250930-113331.yaml b/dbt-redshift/.changes/unreleased/Features-20250930-113331.yaml
@@ -0,0 +1,6 @@
+kind: Features
+body: Add support for scalar functions
+time: 2025-09-30T11:33:31.713-05:00
+custom:
+  Author: QMalcolm
+  Issue: "1291"
diff --git a/dbt-redshift/.changes/unreleased/Fixes-20251002-120929.yaml b/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"
diff --git a/dbt-redshift/src/dbt/include/redshift/macros/materializations/functions/scalar.sql b/dbt-redshift/src/dbt/include/redshift/macros/materializations/functions/scalar.sql
@@ -0,0 +1,16 @@
+{% macro redshift__scalar_function_create_replace_signature_sql(target_relation) %}
+    CREATE OR REPLACE FUNCTION {{ target_relation.render() }} ({{ formatted_scalar_function_args_sql()}})
+        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
+    AS
+{% endmacro %}
+
+{% macro redshift__formatted_scalar_function_args_sql() %}
+    {% set args = [] %}
+    {% for arg in model.arguments -%}
+        {%- do args.append(arg.data_type) -%}
+    {%- endfor %}
+    {{ args | join(', ') }}
+{% endmacro %}
diff --git a/dbt-redshift/tests/functional/functions/files.py b/dbt-redshift/tests/functional/functions/files.py
@@ -0,0 +1,3 @@
+MY_UDF_SQL = """
+SELECT $1 * 2
+""".strip()
diff --git a/dbt-redshift/tests/functional/functions/test_udfs.py b/dbt-redshift/tests/functional/functions/test_udfs.py
@@ -0,0 +1,17 @@
+from dbt.artifacts.schemas.results import RunStatus
+from dbt.contracts.graph.nodes import FunctionNode
+from dbt.tests.util import run_dbt
+import pytest
+from dbt.tests.adapter.functions.files import MY_UDF_YML
+from dbt.tests.adapter.functions.test_udfs import UDFsBasic
+from tests.functional.functions.files import MY_UDF_SQL
+
+
+class TestRedshiftUDFs(UDFsBasic):
+
+    @pytest.fixture(scope="class")
+    def functions(self):
+        return {
+            "price_for_xlarge.sql": MY_UDF_SQL,
+            "price_for_xlarge.yml": MY_UDF_YML,
+        }
diff --git a/dbt-snowflake/.changes/unreleased/Features-20250929-133450.yaml b/dbt-snowflake/.changes/unreleased/Features-20250929-133450.yaml
@@ -0,0 +1,6 @@
+kind: Features
+body: Support for scalar functions
+time: 2025-09-29T13:34:50.215419-05:00
+custom:
+  Author: QMalcolm
+  Issue: "1292"
diff --git a/dbt-snowflake/.changes/unreleased/Fixes-20251002-120639.yaml b/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"
diff --git a/dbt-snowflake/src/dbt/adapters/snowflake/relation_configs/policies.py b/dbt-snowflake/src/dbt/adapters/snowflake/relation_configs/policies.py
@@ -10,6 +10,7 @@ class SnowflakeRelationType(StrEnum):
     CTE = "cte"
     External = "external"
     DynamicTable = "dynamic_table"
+    Function = "function"
 
 
 class SnowflakeIncludePolicy(Policy):
diff --git a/dbt-snowflake/src/dbt/include/snowflake/macros/materializations/functions/scalar.sql b/dbt-snowflake/src/dbt/include/snowflake/macros/materializations/functions/scalar.sql
@@ -0,0 +1,12 @@
+{% macro snowflake__scalar_function_create_replace_signature_sql(target_relation) %}
+    CREATE OR REPLACE FUNCTION {{ target_relation.render() }} ({{ formatted_scalar_function_args_sql()}})
+    RETURNS {{ model.returns.data_type }}
+    LANGUAGE SQL
+    AS
+{% endmacro %}
+
+{% macro snowflake__scalar_function_body_sql() %}
+    $$
+       {{ model.compiled_code }}
+    $$
+{% endmacro %}
diff --git a/dbt-snowflake/tests/functional/functions/files.py b/dbt-snowflake/tests/functional/functions/files.py
@@ -0,0 +1,3 @@
+MY_UDF_SQL = """
+price * 2
+""".strip()
diff --git a/dbt-snowflake/tests/functional/functions/test_udfs.py b/dbt-snowflake/tests/functional/functions/test_udfs.py
@@ -0,0 +1,16 @@
+import pytest
+from dbt.tests.adapter.functions.files import MY_UDF_YML
+from dbt.tests.adapter.functions.test_udfs import UDFsBasic
+from tests.functional.functions.files import MY_UDF_SQL
+
+
+class TestSnowflakeUDFs(UDFsBasic):
+
+    @pytest.fixture(scope="class")
+    def functions(self):
+        return {
+            "price_for_xlarge.sql": MY_UDF_SQL,
+            "price_for_xlarge.yml": MY_UDF_YML,
+        }
+
+    pass
diff --git a/dbt-tests-adapter/.changes/1.19.1.md b/dbt-tests-adapter/.changes/1.19.1.md
@@ -0,0 +1,13 @@
+## dbt-tests-adapter 1.19.1 - October 02, 2025
+
+### Features
+
+- Add new test base for UDFs ([#1268](https://github.com/dbt-labs/dbt-adapters/issues/1268))
+
+### Fixes
+
+- Fix duplicates when hard_deletes new_record is used with custom dbt_valid_to_current ([#1240](https://github.com/dbt-labs/dbt-adapters/issues/1240))
+- Fix file fixtures for functions to use proper function property names ([#1365](https://github.com/dbt-labs/dbt-adapters/issues/1365))
+
+### Contributors
+- [@jeremyyeo](https://github.com/jeremyyeo) ([#1240](https://github.com/dbt-labs/dbt-adapters/issues/1240))
diff --git a/dbt-tests-adapter/.changes/unreleased/Features-20250910-131112.yaml b/dbt-tests-adapter/.changes/unreleased/Features-20250910-131112.yaml
diff --git a/dbt-tests-adapter/.changes/unreleased/Fixes-20250903-152930.yaml b/dbt-tests-adapter/.changes/unreleased/Fixes-20250903-152930.yaml
diff --git a/dbt-tests-adapter/CHANGELOG.md b/dbt-tests-adapter/CHANGELOG.md
@@ -10,13 +10,26 @@ and is generated by [Changie](https://github.com/miniscruff/changie)
 - Do not edit this file directly. This file is auto-generated using [changie](https://github.com/miniscruff/changie)
 - For details on how to document a change, see the [contributing guide](/CONTRIBUTING.md#changelog-entry)
 
-## dbt-tests-adapter 1.18.0 - August 19, 2025
+## dbt-tests-adapter 1.19.1 - October 02, 2025
 
 ### Features
 
-- Add new test for test unit tests involing models with columns with reserved words ([#1273](https://github.com/dbt-labs/dbt-adapters/issues/1273))
+- Add new test base for UDFs ([#1268](https://github.com/dbt-labs/dbt-adapters/issues/1268))
+
+### Fixes
+
+- Fix duplicates when hard_deletes new_record is used with custom dbt_valid_to_current ([#1240](https://github.com/dbt-labs/dbt-adapters/issues/1240))
+- Fix file fixtures for functions to use proper function property names ([#1365](https://github.com/dbt-labs/dbt-adapters/issues/1365))
+
+### Contributors
+- [@jeremyyeo](https://github.com/jeremyyeo) ([#1240](https://github.com/dbt-labs/dbt-adapters/issues/1240))
+
+
+## dbt-tests-adapter 1.18.0 - August 19, 2025
 
+### Features
 
+- Add new test for test unit tests involing models with columns with reserved words ([#1273](https://github.com/dbt-labs/dbt-adapters/issues/1273))
 
 ## dbt-tests-adapter 1.17.0 - July 29, 2025
 
diff --git a/dbt-tests-adapter/src/dbt/tests/__about__.py b/dbt-tests-adapter/src/dbt/tests/__about__.py
@@ -1 +1 @@
-version = "1.18.0"
+version = "1.19.1"
diff --git a/dbt-tests-adapter/src/dbt/tests/adapter/functions/files.py b/dbt-tests-adapter/src/dbt/tests/adapter/functions/files.py
@@ -8,9 +8,9 @@
     description: Calculate the price for the xlarge version of a standard item
     arguments:
       - name: price
-        type: float
+        data_type: float
         description: The price of the standard item
-    return_type:
-      type: float
+    returns:
+      data_type: float
       description: The resulting xlarge price
 """
diff --git a/dbt-tests-adapter/src/dbt/tests/adapter/functions/test_udfs.py b/dbt-tests-adapter/src/dbt/tests/adapter/functions/test_udfs.py
@@ -25,7 +25,6 @@ def test_udfs(self, project):
         assert isinstance(node, FunctionNode)
         assert node_result.node.name == "price_for_xlarge"
 
-        # TODO: use `function` instead of `ref`
         result = run_dbt(["show", "--inline", "SELECT {{ function('price_for_xlarge') }}(100)"])
         assert len(result.results) == 1
         # The result should have an agate table with one row and one column (and thus only one value, which is our inline selection)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version = "1.17.0"`
	`1`	`+version = "1.17.2"`