fix for colliding temp tables

dbt-labs · May 29, 2019 · 2ef3981 · 2ef3981
1 parent f0e7e98
commit 2ef3981
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/core/dbt/include/global_project/macros/adapters/common.sql b/core/dbt/include/global_project/macros/adapters/common.sql
@@ -255,8 +255,8 @@
   {{ return(load_result('check_schema_exists').table) }}
 {% endmacro %}
 
-{% macro make_temp_relation(base_relation, suffix='__dbt_tmp') %}
-  {{ return(adapter_macro('make_temp_relation', base_relation, suffix))}}
+{% macro make_temp_relation(base_relation, suffix="__dbt_tmp") %}
+  {{ return(adapter_macro('make_temp_relation', base_relation, suffix)) }}
 {% endmacro %}
 
 {% macro default__make_temp_relation(base_relation, suffix) %}

diff --git a/core/dbt/include/global_project/macros/etc/datetime.sql b/core/dbt/include/global_project/macros/etc/datetime.sql
@@ -54,3 +54,6 @@
     {{ return(dates_in_range(start_date, end_date, in_fmt=date_fmt)) }}
 {% endmacro %}
 
+{% macro py_current_timestring() %}
+    {% do return(modules.datetime.datetime.now().timestamp() | string | replace(".", "_")) %}
+{% endmacro %}
diff --git a/core/dbt/include/global_project/macros/materializations/incremental/incremental.sql b/core/dbt/include/global_project/macros/materializations/incremental/incremental.sql
@@ -17,7 +17,7 @@
   {%- set identifier = model['alias'] -%}
   {%- set old_relation = adapter.get_relation(database=database, schema=schema, identifier=identifier) -%}
   {%- set target_relation = api.Relation.create(identifier=identifier, schema=schema, database=database,  type='table') -%}
-  {%- set tmp_relation = make_temp_relation(target_relation, '__dbt_incremental_tmp') %}
+  {%- set tmp_relation = make_temp_relation(target_relation) %}
 
   {%- set full_refresh_mode = (flags.FULL_REFRESH == True) -%}
 

diff --git a/plugins/postgres/dbt/include/postgres/macros/adapters.sql b/plugins/postgres/dbt/include/postgres/macros/adapters.sql
@@ -97,7 +97,7 @@
 {%- endmacro %}
 
 {% macro postgres__make_temp_relation(base_relation, suffix) %}
-    {% set tmp_identifier = base_relation.identifier ~ suffix %}
+    {% set tmp_identifier = base_relation.identifier ~ suffix ~ py_current_timestring() %}
     {% do return(base_relation.incorporate(
                                   table_name=tmp_identifier,
                                   path={

diff --git a/plugins/snowflake/dbt/include/snowflake/macros/materializations/incremental.sql b/plugins/snowflake/dbt/include/snowflake/macros/materializations/incremental.sql
@@ -11,7 +11,7 @@
                                                 identifier=identifier,
                                                 type='table') -%}
 
-  {%- set tmp_relation = make_temp_relation(target_relation, '__dbt_tmp') %}
+  {%- set tmp_relation = make_temp_relation(target_relation) %}
 
   -- setup
   {{ run_hooks(pre_hooks, inside_transaction=False) }}