Merge branch 'main' into add_release_internal_workflow

.changes/unreleased/Fixes-20240318-203635.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Acknowledge `send_anonymous_usage_stats` setting for python models
+time: 2024-03-18T20:36:35.396323-04:00
+custom:
+  Author: mikealfare
+  Issue: "830"

.changes/unreleased/Fixes-20240322-104553.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: remove `private_key_path` from connection keys
+time: 2024-03-22T10:45:53.598328-05:00
+custom:
+  Author: McKnight-42
+  Issue: "949"

.changes/unreleased/Under the Hood-20240227-010428.yaml

@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Add unit test for transaction semantics.
+time: 2024-02-27T01:04:28.713433-08:00
+custom:
+  Author: versusfacit
+  Issue: "912"

dbt/adapters/snowflake/connections.py

@@ -125,7 +125,6 @@ def _connection_keys(self):
             "role",
             "schema",
             "authenticator",
-            "private_key_path",
             "oauth_client_id",
             "query_tag",
             "client_session_keep_alive",

dbt/adapters/snowflake/impl.py

@@ -217,10 +217,13 @@ def submit_python_job(self, parsed_model: dict, compiled_code: str):
         if imports:
             imports = f"IMPORTS = ('{imports}')"
 
-        snowpark_telemetry_string = "dbtLabs_dbtPython"
-        snowpark_telemetry_snippet = f"""
+        if self.config.args.SEND_ANONYMOUS_USAGE_STATS:
+            snowpark_telemetry_string = "dbtLabs_dbtPython"
+            snowpark_telemetry_snippet = f"""
 import sys
 sys._xoptions['snowflake_partner_attribution'].append("{snowpark_telemetry_string}")"""
+        else:
+            snowpark_telemetry_snippet = ""
 
         common_procedure_code = f"""
 RETURNS STRING

dbt/adapters/snowflake/relation.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Optional, Type
+from typing import FrozenSet, Optional, Type
 
 from dbt.adapters.base.relation import BaseRelation
 from dbt.adapters.relation_configs import RelationConfigChangeAction, RelationResults
@@ -20,13 +20,24 @@
 class SnowflakeRelation(BaseRelation):
     type: Optional[SnowflakeRelationType] = None  # type: ignore
     quote_policy: SnowflakeQuotePolicy = field(default_factory=lambda: SnowflakeQuotePolicy())
-    renameable_relations = frozenset({SnowflakeRelationType.Table, SnowflakeRelationType.View})
-    replaceable_relations = frozenset(
-        {
-            SnowflakeRelationType.DynamicTable,
-            SnowflakeRelationType.Table,
-            SnowflakeRelationType.View,
-        }
+
+    renameable_relations: FrozenSet[SnowflakeRelationType] = field(
+        default_factory=lambda: frozenset(
+            {
+                SnowflakeRelationType.Table,
+                SnowflakeRelationType.View,
+            }
+        )
+    )
+
+    replaceable_relations: FrozenSet[SnowflakeRelationType] = field(
+        default_factory=lambda: frozenset(
+            {
+                SnowflakeRelationType.DynamicTable,
+                SnowflakeRelationType.Table,
+                SnowflakeRelationType.View,
+            }
+        )
     )
 
     @property

dbt/include/snowflake/macros/relations/dynamic_table/create.sql

@@ -6,6 +6,5 @@
         as (
             {{ sql }}
         )
-    ;
 
 {%- endmacro %}

tests/functional/adapter/test_anonymous_usage_stats.py

@@ -0,0 +1,43 @@
+from dbt.tests.util import run_dbt_and_capture
+import pytest
+
+
+ANONYMOUS_USAGE_MESSAGE = """
+sys._xoptions['snowflake_partner_attribution'].append("dbtLabs_dbtPython")
+""".strip()
+
+
+MY_PYTHON_MODEL = """
+import pandas
+
+def model(dbt, session):
+    dbt.config(materialized='table')
+    data = [[1,2]] * 10
+    return pandas.DataFrame(data, columns=['test', 'test2'])
+"""
+
+
+class AnonymousUsageStatsBase:
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {"my_python_model.py": MY_PYTHON_MODEL}
+
+
+class TestAnonymousUsageStatsOn(AnonymousUsageStatsBase):
+    @pytest.fixture(scope="class")
+    def project_config_update(self):
+        return {"flags": {"send_anonymous_usage_stats": True}}
+
+    def test_stats_get_sent(self, project):
+        _, logs = run_dbt_and_capture(["--debug", "run"])
+        assert ANONYMOUS_USAGE_MESSAGE in logs
+
+
+class TestAnonymousUsageStatsOff(AnonymousUsageStatsBase):
+    @pytest.fixture(scope="class")
+    def project_config_update(self, dbt_profile_target):
+        return {"flags": {"send_anonymous_usage_stats": False}}
+
+    def test_stats_do_not_get_sent(self, project):
+        _, logs = run_dbt_and_capture(["--debug", "run"])
+        assert ANONYMOUS_USAGE_MESSAGE not in logs

tests/unit/test_renamed_relations.py

@@ -0,0 +1,17 @@
+from dbt.adapters.snowflake.relation import SnowflakeRelation
+from dbt.adapters.snowflake.relation_configs import SnowflakeRelationType
+
+
+def test_renameable_relation():
+    relation = SnowflakeRelation.create(
+        database="my_db",
+        schema="my_schema",
+        identifier="my_table",
+        type=SnowflakeRelationType.Table,
+    )
+    assert relation.renameable_relations == frozenset(
+        {
+            SnowflakeRelationType.Table,
+            SnowflakeRelationType.View,
+        }
+    )