Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 1.5.latest] Fix: avoid double-rendering sql_header in dbt show #8742

Merged
merged 1 commit into from
Sep 28, 2023
Merged

[Backport 1.5.latest] Fix: avoid double-rendering sql_header in dbt show #8742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/unreleased/Fixes-20230928-184856.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 0 additions & 2 deletions core/dbt/include/global_project/macros/adapters/show.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -%}
Expand Down
6 changes: 4 additions & 2 deletions tests/adapter/dbt/tests/adapter/dbt_show/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = """
Expand Down
1 change: 0 additions & 1 deletion tests/adapter/dbt/tests/adapter/dbt_show/test_dbt_show.py
View file
Open in desktop
Original file line number Diff 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
Loading