Merge pull request #318 from ScalefreeCOM/29-fabric-move-prepend_generated_by-after-first-with-to-allow-data-preview

tkiehn · web-flow · commit aa7d554a06b5 · 2025-02-12T14:06:05.000+01:00
[Fabric] Move prepend generated by after first with to allow data preview
diff --git a/macros/staging/fabric/stage.sql b/macros/staging/fabric/stage.sql
@@ -177,10 +177,10 @@
 {#- Setting the rsrc default datatype -#}
 {%- set rsrc_default_dtype = datavault4dbt.string_default_dtype(type=rsrc) -%}
 
-{{ datavault4dbt.prepend_generated_by() }}
-
 WITH
 
+{{ datavault4dbt.prepend_generated_by() }}
+
 {# Selecting everything that we need from the source relation. #}
 source_data AS (
     SELECT 
diff --git a/macros/tables/fabric/eff_sat_v0.sql b/macros/tables/fabric/eff_sat_v0.sql
@@ -16,10 +16,10 @@
 
 {{ log('columns to select: '~final_columns_to_select, false) }}
 
-{{ datavault4dbt.prepend_generated_by() }}
-
 WITH 
 
+{{ datavault4dbt.prepend_generated_by() }}
+
 {#
     In all cases, the source model is selected, and optionally a HWM is applied. 
 #}
diff --git a/macros/tables/fabric/hub.sql b/macros/tables/fabric/hub.sql
@@ -31,10 +31,11 @@
 {%- set src_ldts = datavault4dbt.escape_column_names(src_ldts) -%}
 {%- set src_rsrc = datavault4dbt.escape_column_names(src_rsrc) -%}
 
-{{ datavault4dbt.prepend_generated_by() }}
 
 WITH
 
+{{ datavault4dbt.prepend_generated_by() }}
+
 {% if is_incremental() -%}
 {# Get all target hashkeys out of the existing hub for later incremental logic. #}
     distinct_target_hashkeys AS (
diff --git a/macros/tables/fabric/link.sql b/macros/tables/fabric/link.sql
@@ -34,10 +34,10 @@
 {%- set src_ldts = datavault4dbt.escape_column_names(src_ldts) -%}
 {%- set src_rsrc = datavault4dbt.escape_column_names(src_rsrc) -%}
 
-{{ datavault4dbt.prepend_generated_by() }}
-
 WITH
 
+{{ datavault4dbt.prepend_generated_by() }}
+
 {% if is_incremental() %}
 {# Get all link hashkeys out of the existing link for later incremental logic. #}
     distinct_target_hashkeys AS (
diff --git a/macros/tables/fabric/ma_sat_v0.sql b/macros/tables/fabric/ma_sat_v0.sql
@@ -26,11 +26,13 @@
 {%- set src_payload = datavault4dbt.escape_column_names(src_payload) -%}
 {%- set src_ldts = datavault4dbt.escape_column_names(src_ldts) -%}
 {%- set src_rsrc = datavault4dbt.escape_column_names(src_rsrc) -%}
-
-{{ datavault4dbt.prepend_generated_by() }}
  
 {# Selecting all source data, that is newer than latest data in sat if incremental #}
-WITH source_data AS (
+WITH 
+
+{{ datavault4dbt.prepend_generated_by() }}
+
+source_data AS (
 
     SELECT
         {{ parent_hashkey }},
diff --git a/macros/tables/fabric/ma_sat_v1.sql b/macros/tables/fabric/ma_sat_v1.sql
@@ -22,11 +22,10 @@
 {% set hashkey = datavault4dbt.escape_column_names(hashkey) %}
 {% set hashdiff = datavault4dbt.escape_column_names(hashdiff) %}
 
+WITH
 
 {{ datavault4dbt.prepend_generated_by() }}
 
-WITH
-
 {# Getting everything from the underlying v0 satellite. #}
 source_satellite AS (
 
diff --git a/macros/tables/fabric/nh_link.sql b/macros/tables/fabric/nh_link.sql
@@ -50,10 +50,10 @@
 {%- set src_ldts = datavault4dbt.escape_column_names(src_ldts) -%}
 {%- set src_rsrc = datavault4dbt.escape_column_names(src_rsrc) -%}
 
-{{ datavault4dbt.prepend_generated_by() }}
-
 WITH
 
+{{ datavault4dbt.prepend_generated_by() }}
+
 {%- if is_incremental() -%}
 {# Get all link hashkeys out of the existing link for later incremental logic. #}
     distinct_target_hashkeys AS (
diff --git a/macros/tables/fabric/nh_sat.sql b/macros/tables/fabric/nh_sat.sql
@@ -16,11 +16,10 @@
 {%- set src_ldts = datavault4dbt.escape_column_names(src_ldts) -%}
 {%- set src_rsrc = datavault4dbt.escape_column_names(src_rsrc) -%}
 
+WITH
 
 {{ datavault4dbt.prepend_generated_by() }}
 
-WITH
-
 {# Selecting all source data, that is newer than latest data in sat if incremental #}
 source_data AS (
 
diff --git a/macros/tables/fabric/pit.sql b/macros/tables/fabric/pit.sql
@@ -27,11 +27,10 @@
 {%- set ldts = datavault4dbt.escape_column_names(ldts) -%}
 {%- set ledts = datavault4dbt.escape_column_names(ledts) -%}
 
+WITH
 
 {{ datavault4dbt.prepend_generated_by() }}
 
-WITH
-
 {%- if is_incremental() %}
 
 existing_dimension_keys AS (
diff --git a/macros/tables/fabric/rec_track_sat.sql b/macros/tables/fabric/rec_track_sat.sql
@@ -30,11 +30,10 @@
 {%- set src_rsrc = datavault4dbt.escape_column_names(src_rsrc) -%}
 {%- set src_stg = datavault4dbt.escape_column_names(src_stg) -%}
 
+WITH
 
 {{ datavault4dbt.prepend_generated_by() }}
 
-WITH
-
 {% if is_incremental() %}
 
     distinct_target AS ( 
diff --git a/macros/tables/fabric/ref_hub.sql b/macros/tables/fabric/ref_hub.sql
@@ -28,10 +28,10 @@
 {%- set src_ldts = datavault4dbt.escape_column_names(src_ldts) -%}
 {%- set src_rsrc = datavault4dbt.escape_column_names(src_rsrc) -%}
 
-{{ datavault4dbt.prepend_generated_by() }}
-
 WITH
 
+{{ datavault4dbt.prepend_generated_by() }}
+
 {% if is_incremental() -%}
 {# Get all target ref_keys out of the existing ref_table for later incremental logic. #}
     distinct_target_ref_keys AS (
diff --git a/macros/tables/fabric/ref_sat_v0.sql b/macros/tables/fabric/ref_sat_v0.sql
@@ -27,10 +27,10 @@
 {%- set source_cols = datavault4dbt.escape_column_names(source_cols) -%}
 {%- set src_ldts = datavault4dbt.escape_column_names(src_ldts) -%}
 
-{{ datavault4dbt.prepend_generated_by() }}
-
 WITH
 
+{{ datavault4dbt.prepend_generated_by() }}
+
 {# Selecting all source data, that is newer than latest data in ref_sat if incremental #}
 source_data AS (
 
diff --git a/macros/tables/fabric/ref_sat_v1.sql b/macros/tables/fabric/ref_sat_v1.sql
@@ -22,11 +22,10 @@
 {%- set src_rsrc = datavault4dbt.escape_column_names(src_rsrc) -%}
 {%- set ledts_alias = datavault4dbt.escape_column_names(ledts_alias) -%}
 
+WITH
 
 {{ datavault4dbt.prepend_generated_by() }}
 
-WITH
-
 {# Calculate ledts based on the ldts of the earlier record. #}
 end_dated_source AS (
 
diff --git a/macros/tables/fabric/ref_table.sql b/macros/tables/fabric/ref_table.sql
@@ -39,11 +39,10 @@
 {%- set sdts_alias = datavault4dbt.escape_column_names(sdts_alias) -%}
 {%- set is_current_col_alias = datavault4dbt.escape_column_names(is_current_col_alias) -%}
 
+WITH 
 
 {{ datavault4dbt.prepend_generated_by() }}
 
-WITH 
-
 dates AS (
 
 {% if historized in ['full', 'latest'] -%}
diff --git a/macros/tables/fabric/sat_v0.sql b/macros/tables/fabric/sat_v0.sql
@@ -23,10 +23,10 @@
 {% set parent_hashkey = datavault4dbt.escape_column_names(parent_hashkey) %}
 {% set src_hashdiff = datavault4dbt.escape_column_names(src_hashdiff) %}
 
-{{ datavault4dbt.prepend_generated_by() }}
-
 WITH
 
+{{ datavault4dbt.prepend_generated_by() }}
+
 {# Selecting all source data, that is newer than latest data in sat if incremental #}
 source_data AS (
 
diff --git a/macros/tables/fabric/sat_v1.sql b/macros/tables/fabric/sat_v1.sql
@@ -20,10 +20,10 @@
 {% set hashkey = datavault4dbt.escape_column_names(hashkey) %}
 {% set hashdiff = datavault4dbt.escape_column_names(hashdiff) %}
 
-{{ datavault4dbt.prepend_generated_by() }}
-
 WITH
 
+{{ datavault4dbt.prepend_generated_by() }}
+
 {# Calculate ledts based on the ldts of the earlier record. #}
 end_dated_source AS (
 
