Fix: avoid double-rendering sql_header in dbt show (#8740)

(cherry picked from commit 408a789)
dbt-labs · Sep 28, 2023 · 08624c9 · 08624c9
1 parent e8497a1
commit 08624c9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.changes/unreleased/Fixes-20230928-184856.yaml b/.changes/unreleased/Fixes-20230928-184856.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: avoid double-rendering sql_header in dbt show
+time: 2023-09-28T18:48:56.419428+01:00
+custom:
+  Author: michelleark
+  Issue: "8739"
diff --git a/core/dbt/include/global_project/macros/adapters/show.sql b/core/dbt/include/global_project/macros/adapters/show.sql
@@ -1,6 +1,4 @@
 {% macro get_show_sql(compiled_code, sql_header, limit) -%}
-  {%- set sql_header = sql_header -%}
-  {{ sql_header if sql_header is not none }}
   {%- if sql_header -%}
   {{ sql_header }}
   {%- endif -%}

diff --git a/tests/adapter/dbt/tests/adapter/dbt_show/fixtures.py b/tests/adapter/dbt/tests/adapter/dbt_show/fixtures.py
@@ -1,8 +1,10 @@
 models__sql_header = """
 {% call set_sql_header(config) %}
-set session time zone '{{ var("timezone", "Europe/Paris") }}';
+with _variables as (
+    select 1 as my_variable
+)
 {%- endcall %}
-select current_setting('timezone') as timezone
+select my_variable from _variables
 """
 
 models__ephemeral_model = """

diff --git a/tests/adapter/dbt/tests/adapter/dbt_show/test_dbt_show.py b/tests/adapter/dbt/tests/adapter/dbt_show/test_dbt_show.py
@@ -50,7 +50,6 @@ def models(self):
         }
 
     def test_sql_header(self, project):
-        run_dbt(["build", "--vars", "timezone: Asia/Kolkata"])
         run_dbt(["show", "--select", "sql_header", "--vars", "timezone: Asia/Kolkata"])
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,6 @@ def models(self): @@
             }
         def test_sql_header(self, project):
-            run_dbt(["build", "--vars", "timezone: Asia/Kolkata"])
             run_dbt(["show", "--select", "sql_header", "--vars", "timezone: Asia/Kolkata"])
@@ Expand Down @@