Merge pull request #30 from calogica/fix/get-base-dates-datepart

Add support for date parts in get_base_dates

dbt_project.yml

@@ -18,7 +18,3 @@ quoting:
 vars:
     'dbt_date:time_zone': 'America/Los_Angeles'
 
-models:
-    dbt_date:
-        example_models:
-            enabled: false

integration_tests/models/dates.sql

@@ -0,0 +1,6 @@
+{{
+    config(
+        materialized = "ephemeral"
+    )
+}}
+{{ dbt_date.get_date_dimension('2015-01-01', '2022-12-31') }}

models/example_models/dim_date.sql → integration_tests/models/dim_date.sql

@@ -1,3 +1,8 @@
+{{
+    config(
+        materialized = "table"
+    )
+}}
 with date_dimension as (
     select * from {{ ref('dates') }}
 ),
@@ -6,7 +11,7 @@ fiscal_periods as (
 )
 select
     d.*,
-    f.fiscal_week_of_year, 
+    f.fiscal_week_of_year,
     f.fiscal_week_of_period,
     f.fiscal_period_number,
     f.fiscal_quarter_number,
@@ -15,4 +20,4 @@ from
     date_dimension d
     left outer join
     fiscal_periods f
-        on d.date_day = f.date_day
+        on d.date_day = f.date_day

models/example_models/dim_date_fiscal.sql → integration_tests/models/dim_date_fiscal.sql

@@ -1,7 +1,12 @@
+{{
+    config(
+        materialized = "table"
+    )
+}}
 with fp as (
     {{ dbt_date.get_fiscal_periods(ref('dates'), year_end_month=1, week_start_day=1) }}
 )
 select
     f.*
 from
-    fp f
+    fp f

integration_tests/models/dim_hour.sql

@@ -0,0 +1,12 @@
+{{
+    config(
+        materialized = "table"
+    )
+}}
+with periods_hours as (
+    {{ dbt_date.get_base_dates(n_dateparts=24*28, datepart="hour") }}
+)
+select
+    d.*
+from
+    periods_hours d

integration_tests/models/dim_week.sql

@@ -0,0 +1,12 @@
+{{
+    config(
+        materialized = "table"
+    )
+}}
+with periods_weeks as (
+    {{ dbt_date.get_base_dates(n_dateparts=52, datepart="week") }}
+)
+select
+    d.*
+from
+    periods_weeks d

macros/get_base_dates.sql

@@ -1,4 +1,4 @@
-{% macro get_base_dates(start_date=None, end_date=None, n_dateparts=None, datepart=None) %}
+{% macro get_base_dates(start_date=None, end_date=None, n_dateparts=None, datepart="day") %}
     {{ adapter.dispatch('get_base_dates', packages = dbt_date._get_utils_namespaces()) (start_date, end_date, n_dateparts, datepart) }}
 {% endmacro %}
 
@@ -16,15 +16,15 @@ with date_spine as
     {% endif %}
 
     {{ dbt_utils.date_spine(
-        datepart="day",
+        datepart=datepart,
         start_date=start_date,
         end_date=end_date,
        )
     }}
 
 )
 select
-    cast(d.date_day as date) as date_day
+    cast(d.date_{{ datepart }} as {{ dbt_utils.type_timestamp() }}) as date_{{ datepart }}
 from
     date_spine d
 {% endmacro %}
@@ -43,15 +43,15 @@ with date_spine as
     {% endif %}
 
     {{ dbt_utils.date_spine(
-        datepart="day",
+        datepart=datepart,
         start_date=start_date,
         end_date=end_date,
        )
     }}
 
 )
 select
-    cast(d.date_day as date) as date_day
+    cast(d.date_{{ datepart }} as {{ dbt_utils.type_timestamp() }}) as date_{{ datepart }}
 from
     date_spine d
 {% endmacro %}