Merge branch 'main' into addQueryRetries

dbt-labs · Dec 5, 2024 · 3303d5e · 3303d5e
2 parents 128bb28 + c7b12ae
commit 3303d5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/dbt/adapters/__about__.py b/dbt/adapters/__about__.py
@@ -1 +1 @@
-version = "1.10.3"
+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 %}