Fix week comparison

first_date and second_date need to be compared in sql instead of jinja, as their values are going to come from the sql data.
dbt-labs · Feb 24, 2020 · 7871a21 · 7871a21
1 parent 2b1f3bc
commit 7871a21
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/macros/cross_db_utils/datediff.sql b/macros/cross_db_utils/datediff.sql
@@ -35,10 +35,13 @@
         ({{ dbt_utils.datediff(first_date, second_date, 'year') }} * 12 + date_part('month', ({{second_date}})::date) - date_part('month', ({{first_date}})::date))
     {% elif datepart == 'day' %}
         (({{second_date}})::date - ({{first_date}})::date)
-    {% elif datepart == 'week' and first_date <= second_date %}
-        ({{ dbt_utils.datediff(first_date, second_date, 'day') }} / 7 + case when date_part('dow', ({{second_date}})::timestamp) < date_part('dow', ({{first_date}})::timestamp) then 1 else 0 end)
     {% elif datepart == 'week' %}
-        ({{ dbt_utils.datediff(first_date, second_date, 'day') }} / 7 + case when date_part('dow', ({{second_date}})::timestamp) > date_part('dow', ({{first_date}})::timestamp) then 1 else 0 end)
+        ({{ dbt_utils.datediff(first_date, second_date, 'day') }} / 7 + case
+            when date_part('dow', ({{first_date}})::timestamp) <= date_part('dow', ({{second_date}})::timestamp) then
+                case when {{first_date}} <= {{second_date}} then 0 else -1 end
+            else
+                case when {{first_date}} <= {{second_date}} then 1 else 0 end
+        end)
     {% elif datepart == 'hour' %}
         ({{ dbt_utils.datediff(first_date, second_date, 'day') }} * 24 + date_part('hour', ({{second_date}})::timestamp) - date_part('hour', ({{first_date}})::timestamp))
     {% elif datepart == 'minute' %}