fixing window whitespacing

RobbertDM · Jan 9, 2023 · 6b6d55b · 6b6d55b
1 parent 00b90fe
commit 6b6d55b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -6,7 +6,7 @@ version: "1.0.0"
 config-version: 2
 
 # This setting configures which "profile" dbt uses for this project.
-profile: "dbt_metrics_integration_tests_postgres"
+profile: "dbt_metrics_integration_tests_bigquery"
 
 model-paths: ["models"]
 analysis-paths: ["analyses"]

diff --git a/integration_tests/models/metric_testing_models/base_median_metric_no_time_grain.sql b/integration_tests/models/metric_testing_models/base_median_metric_no_time_grain.sql
@@ -1,5 +1,4 @@
 select *
 from 
-{{ metrics.calculate(metric('base_median_metric'), 
-    dimensions=['had_discount']) 
+{{ metrics.calculate(metric('base_median_metric')) 
 }}
diff --git a/macros/sql_gen/gen_calendar_table_join.sql b/macros/sql_gen/gen_calendar_table_join.sql
@@ -4,7 +4,7 @@
 
 {% macro default__gen_calendar_table_join(metric_dictionary, calendar_tbl) %}
     left join {{calendar_tbl}} calendar_table
-    {%- if metric_dictionary.window is not none -%}
+    {%- if metric_dictionary.window is not none %}
         on cast(base_model.{{metric_dictionary.timestamp}} as date) > dateadd({{metric_dictionary.window.period}}, -{{metric_dictionary.window.count}}, calendar_table.date_day)
         and cast(base_model.{{metric_dictionary.timestamp}} as date) <= calendar_table.date_day
     {%- else %}

diff --git a/macros/sql_gen/gen_property_to_aggregate.sql b/macros/sql_gen/gen_property_to_aggregate.sql
@@ -25,6 +25,7 @@
 {% macro bigquery__property_to_aggregate_median(expression, grain, dimensions, calendar_dimensions) %}
 
     percentile_cont({{expression }}, 0.5) over (
+        {% if grain or dimensions | length > 0 or calendar_dimensions | length > 0 -%}
         partition by 
         {% if grain -%}
         calendar_table.date_{{ grain }}
@@ -43,6 +44,7 @@
         ,calendar_table.{{ calendar_dim }}
             {%- endif -%}
         {%- endfor %}
+        {%- endif %}
     ) as property_to_aggregate
 
 {%- endmacro -%}

diff --git a/tests/functional/calculation_methods/test_median.py b/tests/functional/calculation_methods/test_median.py
@@ -240,7 +240,7 @@ def test_base_median_metric_no_time_grain(self,project,):
       - order_country
 """
 
-# seeds/base_median_metric_no_time_grain__expected.csv
+# seeds/base_median_metric_complicated_source_expected.csv
 base_median_metric_complicated_source__expected_csv = """
 date_month,base_median_metric_complicated_source
 2022-01-01,3.34