Merge branch 'main' into monorepo/shared-workflows

dbt-labs · Dec 5, 2024 · 6d1b194 · 6d1b194
2 parents 87f439a + c7b12ae
commit 6d1b194
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/dbt/adapters/__about__.py b/dbt/adapters/__about__.py
@@ -1 +1 @@
-version = "1.10.2"
+version = "1.10.4"
diff --git a/dbt/include/global_project/macros/adapters/relation.sql b/dbt/include/global_project/macros/adapters/relation.sql
@@ -7,6 +7,11 @@
 {% endmacro %}
 
 {% macro make_temp_relation(base_relation, suffix='__dbt_tmp') %}
+  {#-- This ensures microbatch batches get unique temp relations to avoid clobbering --#}
+  {% if suffix == '__dbt_tmp' and model.batch %}
+    {% set suffix = suffix ~ '_' ~ model.batch.id %}
+  {% endif %}
+
   {{ return(adapter.dispatch('make_temp_relation', 'dbt')(base_relation, suffix)) }}
 {% endmacro %}
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,7 @@ dependencies = [
     "pytz>=2015.7",
     # installed via dbt-common but used directly
     "agate>=1.0,<2.0",
-    "mashumaro[msgpack]>=3.0,<4.0",
+    "mashumaro[msgpack]>=3.9,<3.15",
     "protobuf>=5.0,<6.0",
     "typing-extensions>=4.0,<5.0",
 ]