From 2793f9fb88252bd365375772df36a3e3b7273c2e Mon Sep 17 00:00:00 2001 From: Mila Page <67295367+VersusFacit@users.noreply.github.com> Date: Mon, 25 Nov 2024 09:24:52 -0800 Subject: [PATCH 1/4] Pin Mashumaro to keep aligned with dbt core depedencies (#363) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3c62898d..47cd3ece 100644 --- 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", ] From bb68737b1e9be045f892a32e0797f28a0f3586ac Mon Sep 17 00:00:00 2001 From: Github Build Bot Date: Mon, 25 Nov 2024 17:59:54 +0000 Subject: [PATCH 2/4] Bumping version to 1.10.3 and generate changelog --- dbt/adapters/__about__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt/adapters/__about__.py b/dbt/adapters/__about__.py index 8c657eec..977620c3 100644 --- a/dbt/adapters/__about__.py +++ b/dbt/adapters/__about__.py @@ -1 +1 @@ -version = "1.10.2" +version = "1.10.3" From 86efa882075fbba7cc9ecd91d3ebdebca22e5026 Mon Sep 17 00:00:00 2001 From: Quigley Malcolm Date: Wed, 4 Dec 2024 13:18:33 -0600 Subject: [PATCH 3/4] Append `model.batch.id` to suffix in `make_temp_relation` when present (#361) --- dbt/include/global_project/macros/adapters/relation.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dbt/include/global_project/macros/adapters/relation.sql b/dbt/include/global_project/macros/adapters/relation.sql index b9af4969..ae1f041d 100644 --- 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 %} From a64351152f35bd474f740eba3900838502bf6f65 Mon Sep 17 00:00:00 2001 From: Github Build Bot Date: Thu, 5 Dec 2024 01:46:11 +0000 Subject: [PATCH 4/4] Bumping version to 1.10.4 and generate changelog --- dbt/adapters/__about__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt/adapters/__about__.py b/dbt/adapters/__about__.py index 977620c3..08e0d06b 100644 --- a/dbt/adapters/__about__.py +++ b/dbt/adapters/__about__.py @@ -1 +1 @@ -version = "1.10.3" +version = "1.10.4"