Merge pull request #7 from fishtown-analytics/refactor/incremental-mo…

…del-updates Use is_incremental macro. Remove sql_where
dbt-labs · Feb 4, 2019 · 28cc150 · 28cc150
2 parents ddf851f + 2584950
commit 28cc150
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/macros/cross-adapter-modeling/sessionization/segment_web_page_views__sessionized.sql b/macros/cross-adapter-modeling/sessionization/segment_web_page_views__sessionized.sql
@@ -9,7 +9,6 @@
 
 {{ config(
     materialized = 'incremental',
-    sql_where = 'TRUE',
     unique_key = 'page_view_id',
     sort = 'tstamp',
     dist = 'page_view_id'
@@ -28,7 +27,7 @@ with pageviews as (
 
     select * from {{ref('segment_web_page_views')}}
     
-    {% if adapter.already_exists(this.schema, this.table) and not flags.FULL_REFRESH %}
+    {% if is_incremental() %}
     where anonymous_id in (
         select distinct anonymous_id 
         from {{ref('segment_web_page_views')}} 

diff --git a/macros/cross-adapter-modeling/sessionization/segment_web_sessions.sql b/macros/cross-adapter-modeling/sessionization/segment_web_sessions.sql
@@ -9,13 +9,11 @@
 
 {{ config(
     materialized = 'incremental',
-    sql_where = 'TRUE',
     unique_key = 'session_id',
     sort = 'session_start_tstamp',
     dist = 'session_id'
     )}}
 
-{% set incremental = adapter.already_exists(this.schema, this.table) and not flags.FULL_REFRESH %}
 
 {# 
 Window functions are challenging to make incremental. This approach grabs 
@@ -29,7 +27,7 @@ with sessions as (
 
     select * from {{ref('segment_web_sessions__stitched')}}
 
-    {% if incremental %}
+    {% if is_incremental() %}
     where session_start_tstamp > (
         select 
             dateadd(
@@ -42,7 +40,7 @@ with sessions as (
 
 ),
 
-{% if incremental %}
+{% if is_incremental() %}
 
 agg as (
 
@@ -71,8 +69,8 @@ windowed as (
 
     from sessions
 
-    {% if incremental %} 
     left join agg using (blended_user_id) 
+    {% if is_incremental() %}
     {% endif %}
 
 

diff --git a/macros/cross-adapter-modeling/sessionization/segment_web_sessions__initial.sql b/macros/cross-adapter-modeling/sessionization/segment_web_sessions__initial.sql
@@ -9,7 +9,6 @@
 
 {{ config(
     materialized = 'incremental',
-    sql_where = 'TRUE',
     unique_key = 'session_id',
     sort = 'session_start_tstamp',
     dist = 'session_id'
@@ -51,7 +50,7 @@ with pageviews as (
 
     select * from {{ref('segment_web_page_views__sessionized')}}
 
-    {% if adapter.already_exists(this.schema, this.table) and not flags.FULL_REFRESH %}
+    {% if is_incremental() %}
         where tstamp > (select dateadd(hour, -{{var('segment_sessionization_trailing_window')}}, max(session_start_tstamp)) from {{this}})
     {% endif %}
 

diff --git a/macros/cross-adapter-modeling/sessionization/segment_web_sessions__stitched.sql b/macros/cross-adapter-modeling/sessionization/segment_web_sessions__stitched.sql
@@ -9,7 +9,6 @@
 
 {{ config(
     materialized = 'incremental',
-    sql_where = 'TRUE',
     unique_key = 'session_id',
     sort = 'session_start_tstamp',
     dist = 'session_id'
@@ -19,7 +18,7 @@ with sessions as (
 
     select * from {{ref('segment_web_sessions__initial')}}
 
-    {% if adapter.already_exists(this.schema, this.table) and not flags.FULL_REFRESH %}
+    {% if is_incremental() %}
         where session_start_tstamp > (select dateadd(hour, -{{var('segment_sessionization_trailing_window')}}, max(session_start_tstamp)) from {{this}})
     {% endif %}