Add back code lost in merge

dbt-labs · Jan 25, 2021 · 557bf47 · 557bf47
1 parent 44220ce
commit 557bf47
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/...gration_tests/macros/cleanup_external.sql → ..._tests/macros/common/cleanup_external.sql b/...gration_tests/macros/cleanup_external.sql → ..._tests/macros/common/cleanup_external.sql
@@ -6,14 +6,3 @@
     {% do log('No cleanup necessary, skipping', info = true) %}
     {# noop #}
 {% endmacro %}
-
-{% macro snowflake__cleanup_external() %}
-
-    {% set unset_autocommit %}
-        alter user {{ target.user }} unset autocommit;
-    {% endset %}
-
-    {% do log('Unsetting autocommit parameter for user ' ~ target.user, info = true) %}
-    {% do run_query(unset_autocommit) %}
-
-{% endmacro %}
diff --git a/integration_tests/macros/plugins/snowflake/cleanup_external.sql b/integration_tests/macros/plugins/snowflake/cleanup_external.sql
@@ -0,0 +1,10 @@
+{% macro snowflake__cleanup_external() %}
+
+    {% set unset_autocommit %}
+        alter user {{ target.user }} unset autocommit;
+    {% endset %}
+
+    {% do log('Unsetting autocommit parameter for user ' ~ target.user, info = true) %}
+    {% do run_query(unset_autocommit) %}
+
+{% endmacro %}
diff --git a/integration_tests/macros/plugins/snowflake/prep_external.sql b/integration_tests/macros/plugins/snowflake/prep_external.sql
@@ -13,4 +13,11 @@
     {% do log('Creating external stage ' ~ external_stage, info = true) %}
     {% do run_query(create_external_stage) %}
 
+    {% set set_autocommit_false %}
+        alter user {{ target.user }} set autocommit = false;
+    {% endset %}
+
+    {% do log('Turning off autocommit for user ' ~ target.user, info = true) %}
+    {% do run_query(set_autocommit_false) %}
+
 {% endmacro %}