Merge pull request #72 from fivetran/bugfix/incremental-mar-filter-re…

…moval bugfix/incremental-mar-filter-removal
fivetran · Feb 15, 2023 · 6e5fbe7 · 6e5fbe7
2 parents 226deff + 6568031
commit 6e5fbe7
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# dbt_fivetran_log v0.7.1
+## Bug Fixes
+- Modified the logic within the `fivetran_log__mar_table_history` model to no longer filter out previous historical MAR records. Previously, these fields were filtered out as the `active_volume` source (since deprecated and replaced with `incremental_mar`) produced a cumulative daily MAR total. However, the `incremental_mar` source is not cumulative and will need to include all historical records. ([#72](https://github.com/fivetran/dbt_fivetran_log/pull/72))
+
+## Under the Hood
+- Added coalesce statements to the `paid_monthly_active_rows` and `free_monthly_active_rows` fields within the [fivetran_log__mar_table_history](https://fivetran.github.io/dbt_fivetran_log/#!/model/model.fivetran_log.fivetran_log__mar_table_history) model to coalesce to 0. ([#72](https://github.com/fivetran/dbt_fivetran_log/pull/72))
+
+## Contributors
+- [@pkanter](https://github.com/pkanter) ([#63](https://github.com/fivetran/dbt_fivetran_log/issues/63))
+
 # dbt_fivetran_log v0.7.0
 
 ## 🚨 Breaking Changes 🚨:

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,6 +1,6 @@
 config-version: 2
 name: 'fivetran_log'
-version: '0.7.0'
+version: '0.7.1'
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 
 models:

diff --git a/docs/catalog.json b/docs/catalog.json
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/manifest.json b/docs/manifest.json
diff --git a/docs/run_results.json b/docs/run_results.json
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'fivetran_log_integration_tests'
-version: '0.7.0'
+version: '0.7.1'
 
 config-version: 2
 profile: 'integration_tests'

diff --git a/models/fivetran_log__mar_table_history.sql b/models/fivetran_log__mar_table_history.sql
@@ -30,15 +30,12 @@ ordered_mar as (
         measured_date,
         measured_month,
         incremental_rows,
-        case when lower(free_type) = 'paid'
+        coalesce(case when lower(free_type) = 'paid'
             then incremental_rows
-        end as paid_monthly_active_rows,
-        case when lower(free_type) != 'paid'
+        end, 0) as paid_monthly_active_rows,
+        coalesce(case when lower(free_type) != 'paid'
             then incremental_rows
-        end as free_monthly_active_rows,
-
-        -- each measurement is cumulative for the month, so we'll only look at the latest date for each month
-        row_number() over(partition by table_name, connector_name, destination_id, measured_month order by measured_date desc) as n
+        end, 0) as free_monthly_active_rows
 
     from incremental_mar
 
@@ -57,7 +54,6 @@ latest_mar as (
         (free_monthly_active_rows + paid_monthly_active_rows) as total_monthly_active_rows
 
     from ordered_mar
-    where n = 1
 
 ),