From 2b6745fbe55fd5efbf21dcbd8c1fe782e2c8380a Mon Sep 17 00:00:00 2001 From: Courtney Holcomb Date: Thu, 6 Feb 2025 15:33:16 -0800 Subject: [PATCH] Update SQL engine snapshots --- .../test_custom_offset_window__plan0.sql | 34 +++++++------------ ..._custom_offset_window__plan0_optimized.sql | 20 +++++------ ..._with_granularity_and_date_part__plan0.sql | 34 +++++++------------ ...ularity_and_date_part__plan0_optimized.sql | 20 +++++------ .../test_custom_offset_window__plan0.sql | 34 +++++++------------ ..._custom_offset_window__plan0_optimized.sql | 20 +++++------ ..._with_granularity_and_date_part__plan0.sql | 34 +++++++------------ ...ularity_and_date_part__plan0_optimized.sql | 20 +++++------ .../test_custom_offset_window__plan0.sql | 34 +++++++------------ ..._custom_offset_window__plan0_optimized.sql | 20 +++++------ ..._with_granularity_and_date_part__plan0.sql | 34 +++++++------------ ...ularity_and_date_part__plan0_optimized.sql | 20 +++++------ .../test_custom_offset_window__plan0.sql | 34 +++++++------------ ..._custom_offset_window__plan0_optimized.sql | 20 +++++------ ..._with_granularity_and_date_part__plan0.sql | 34 +++++++------------ ...ularity_and_date_part__plan0_optimized.sql | 20 +++++------ .../test_custom_offset_window__plan0.sql | 34 +++++++------------ ..._custom_offset_window__plan0_optimized.sql | 20 +++++------ ..._with_granularity_and_date_part__plan0.sql | 34 +++++++------------ ...ularity_and_date_part__plan0_optimized.sql | 20 +++++------ .../test_custom_offset_window__plan0.sql | 34 +++++++------------ ..._custom_offset_window__plan0_optimized.sql | 20 +++++------ ..._with_granularity_and_date_part__plan0.sql | 34 +++++++------------ ...ularity_and_date_part__plan0_optimized.sql | 20 +++++------ 24 files changed, 264 insertions(+), 384 deletions(-) diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0.sql index 062719124..4257f8fe1 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0.sql @@ -137,28 +137,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATETIME_TRUNC(time_spine_src_28006.ds, isoweek) AS ds__week - , DATETIME_TRUNC(time_spine_src_28006.ds, month) AS ds__month - , DATETIME_TRUNC(time_spine_src_28006.ds, quarter) AS ds__quarter - , DATETIME_TRUNC(time_spine_src_28006.ds, year) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow - , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -185,8 +175,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN DATE_ADD(CAST(subq_8.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) <= subq_8.ds__alien_day__last_value__lead - THEN DATE_ADD(CAST(subq_8.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) + WHEN DATE_ADD(CAST(subq_8.ds__day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) <= subq_8.ds__day__last_value__lead + THEN DATE_ADD(CAST(subq_8.ds__day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -194,19 +184,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0_optimized.sql index f9fcf051f..a10970f97 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0_optimized.sql @@ -26,12 +26,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -42,8 +42,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN DATE_ADD(CAST(subq_24.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) <= subq_24.ds__alien_day__last_value__lead - THEN DATE_ADD(CAST(subq_24.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) + WHEN DATE_ADD(CAST(subq_24.ds__day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) <= subq_24.ds__day__last_value__lead + THEN DATE_ADD(CAST(subq_24.ds__day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -51,19 +51,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_23 ) subq_24 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0.sql index 0964048bc..7224be9c4 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0.sql @@ -151,28 +151,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATETIME_TRUNC(time_spine_src_28006.ds, isoweek) AS ds__week - , DATETIME_TRUNC(time_spine_src_28006.ds, month) AS ds__month - , DATETIME_TRUNC(time_spine_src_28006.ds, quarter) AS ds__quarter - , DATETIME_TRUNC(time_spine_src_28006.ds, year) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow - , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -199,8 +189,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN DATE_ADD(CAST(subq_8.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) <= subq_8.ds__alien_day__last_value__lead - THEN DATE_ADD(CAST(subq_8.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) + WHEN DATE_ADD(CAST(subq_8.ds__day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) <= subq_8.ds__day__last_value__lead + THEN DATE_ADD(CAST(subq_8.ds__day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -208,19 +198,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql index a18001372..5d50cfee3 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql @@ -31,12 +31,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -47,8 +47,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN DATE_ADD(CAST(subq_25.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) <= subq_25.ds__alien_day__last_value__lead - THEN DATE_ADD(CAST(subq_25.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) + WHEN DATE_ADD(CAST(subq_25.ds__day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) <= subq_25.ds__day__last_value__lead + THEN DATE_ADD(CAST(subq_25.ds__day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -56,19 +56,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_24 ) subq_25 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0.sql index 6eeb5f64e..64f4d387c 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0.sql @@ -137,28 +137,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week - , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month - , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter - , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow - , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -185,8 +175,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) <= subq_8.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) <= subq_8.ds__day__last_value__lead + THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -194,19 +184,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0_optimized.sql index aa5d0085c..29935197d 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0_optimized.sql @@ -26,12 +26,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -42,8 +42,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__alien_day__first_value__lead) <= subq_24.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__day__first_value__lead) <= subq_24.ds__day__last_value__lead + THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -51,19 +51,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_23 ) subq_24 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0.sql index bc7dda620..00dd7fffe 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0.sql @@ -151,28 +151,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week - , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month - , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter - , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow - , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -199,8 +189,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) <= subq_8.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) <= subq_8.ds__day__last_value__lead + THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -208,19 +198,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql index 4a431e2d3..9fd14131a 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql @@ -31,12 +31,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -47,8 +47,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__alien_day__first_value__lead) <= subq_25.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__day__first_value__lead) <= subq_25.ds__day__last_value__lead + THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -56,19 +56,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_24 ) subq_25 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0.sql index 23dc61816..2c1438a38 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0.sql @@ -137,28 +137,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week - , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month - , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter - , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow - , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -185,8 +175,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN subq_8.ds__alien_day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_2.ds__day__row_number - 1) AS INTEGER)) <= subq_8.ds__alien_day__last_value__lead - THEN subq_8.ds__alien_day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_2.ds__day__row_number - 1) AS INTEGER)) + WHEN subq_8.ds__day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_2.ds__day__row_number - 1) AS INTEGER)) <= subq_8.ds__day__last_value__lead + THEN subq_8.ds__day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_2.ds__day__row_number - 1) AS INTEGER)) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -194,19 +184,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0_optimized.sql index 5b6b12e3c..5c1efe848 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0_optimized.sql @@ -26,12 +26,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -42,8 +42,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN subq_24.ds__alien_day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_6.ds__day__row_number - 1) AS INTEGER)) <= subq_24.ds__alien_day__last_value__lead - THEN subq_24.ds__alien_day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_6.ds__day__row_number - 1) AS INTEGER)) + WHEN subq_24.ds__day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_6.ds__day__row_number - 1) AS INTEGER)) <= subq_24.ds__day__last_value__lead + THEN subq_24.ds__day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_6.ds__day__row_number - 1) AS INTEGER)) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -51,19 +51,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_23 ) subq_24 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0.sql index 89aaed5b0..f252e2533 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0.sql @@ -151,28 +151,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week - , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month - , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter - , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow - , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -199,8 +189,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN subq_8.ds__alien_day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_2.ds__day__row_number - 1) AS INTEGER)) <= subq_8.ds__alien_day__last_value__lead - THEN subq_8.ds__alien_day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_2.ds__day__row_number - 1) AS INTEGER)) + WHEN subq_8.ds__day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_2.ds__day__row_number - 1) AS INTEGER)) <= subq_8.ds__day__last_value__lead + THEN subq_8.ds__day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_2.ds__day__row_number - 1) AS INTEGER)) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -208,19 +198,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql index 4506db936..c41dab1c8 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql @@ -31,12 +31,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -47,8 +47,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN subq_25.ds__alien_day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_6.ds__day__row_number - 1) AS INTEGER)) <= subq_25.ds__alien_day__last_value__lead - THEN subq_25.ds__alien_day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_6.ds__day__row_number - 1) AS INTEGER)) + WHEN subq_25.ds__day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_6.ds__day__row_number - 1) AS INTEGER)) <= subq_25.ds__day__last_value__lead + THEN subq_25.ds__day__first_value__lead + MAKE_INTERVAL(days => CAST ((cte_6.ds__day__row_number - 1) AS INTEGER)) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -56,19 +56,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_24 ) subq_25 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0.sql index 5e8c72569..c520becb7 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0.sql @@ -137,28 +137,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week - , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month - , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter - , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow - , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -185,8 +175,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) <= subq_8.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) <= subq_8.ds__day__last_value__lead + THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -194,19 +184,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0_optimized.sql index 2ef82404b..2e7cd963e 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0_optimized.sql @@ -26,12 +26,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -42,8 +42,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__alien_day__first_value__lead) <= subq_24.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__day__first_value__lead) <= subq_24.ds__day__last_value__lead + THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -51,19 +51,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_23 ) subq_24 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0.sql index 40239bc41..448f3fd6e 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0.sql @@ -151,28 +151,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week - , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month - , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter - , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow - , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -199,8 +189,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) <= subq_8.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) <= subq_8.ds__day__last_value__lead + THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -208,19 +198,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql index d69034f57..38e24da80 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql @@ -31,12 +31,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -47,8 +47,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__alien_day__first_value__lead) <= subq_25.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__day__first_value__lead) <= subq_25.ds__day__last_value__lead + THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -56,19 +56,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_24 ) subq_25 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0.sql index 2f3a5efed..44397e5af 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0.sql @@ -137,28 +137,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week - , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month - , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter - , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow - , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -185,8 +175,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) <= subq_8.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) <= subq_8.ds__day__last_value__lead + THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -194,19 +184,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0_optimized.sql index 5129d1dcd..467c9dd8e 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0_optimized.sql @@ -26,12 +26,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -42,8 +42,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__alien_day__first_value__lead) <= subq_24.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__day__first_value__lead) <= subq_24.ds__day__last_value__lead + THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -51,19 +51,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_23 ) subq_24 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0.sql index 4dfa5b734..09a68d388 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0.sql @@ -151,28 +151,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week - , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month - , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter - , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow - , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -199,8 +189,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) <= subq_8.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) <= subq_8.ds__day__last_value__lead + THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -208,19 +198,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql index bc7e619ca..5514f9824 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql @@ -31,12 +31,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -47,8 +47,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__alien_day__first_value__lead) <= subq_25.ds__alien_day__last_value__lead - THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__alien_day__first_value__lead) + WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__day__first_value__lead) <= subq_25.ds__day__last_value__lead + THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_25.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -56,19 +56,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_24 ) subq_25 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0.sql index 71607e52c..f7e8c829c 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0.sql @@ -137,28 +137,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week - , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month - , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter - , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow - , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -185,8 +175,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN DATE_ADD('day', (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) <= subq_8.ds__alien_day__last_value__lead - THEN DATE_ADD('day', (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) + WHEN DATE_ADD('day', (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) <= subq_8.ds__day__last_value__lead + THEN DATE_ADD('day', (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -194,19 +184,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0_optimized.sql index 9bc54bc0c..983f89ab7 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0_optimized.sql @@ -26,12 +26,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -42,8 +42,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN DATE_ADD('day', (cte_6.ds__day__row_number - 1), subq_24.ds__alien_day__first_value__lead) <= subq_24.ds__alien_day__last_value__lead - THEN DATE_ADD('day', (cte_6.ds__day__row_number - 1), subq_24.ds__alien_day__first_value__lead) + WHEN DATE_ADD('day', (cte_6.ds__day__row_number - 1), subq_24.ds__day__first_value__lead) <= subq_24.ds__day__last_value__lead + THEN DATE_ADD('day', (cte_6.ds__day__row_number - 1), subq_24.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -51,19 +51,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_23 ) subq_24 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0.sql index 4b6ffe154..14f5f46af 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0.sql @@ -151,28 +151,18 @@ FROM ( WITH cte_2 AS ( -- Get Custom Granularity Bounds SELECT - time_spine_src_28006.ds AS ds__day - , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week - , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month - , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter - , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year - , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year - , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter - , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month - , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day - , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow - , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy - , time_spine_src_28006.alien_day AS ds__alien_day + subq_6.ds__day + , subq_6.ds__alien_day , FIRST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(subq_6.ds__day) OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY subq_6.ds__alien_day ORDER BY subq_6.ds__day @@ -199,8 +189,8 @@ FROM ( SELECT cte_2.ds__day AS ds__day , CASE - WHEN DATE_ADD('day', (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) <= subq_8.ds__alien_day__last_value__lead - THEN DATE_ADD('day', (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) + WHEN DATE_ADD('day', (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) <= subq_8.ds__day__last_value__lead + THEN DATE_ADD('day', (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_2 cte_2 @@ -208,19 +198,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT subq_7.ds__alien_day - , LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead + , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value FROM cte_2 cte_2 GROUP BY cte_2.ds__alien_day - , cte_2.ds__alien_day__first_value - , cte_2.ds__alien_day__last_value + , cte_2.ds__day__first_value + , cte_2.ds__day__last_value ) subq_7 ) subq_8 ON diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql index 132d67243..2af909228 100644 --- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql +++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql @@ -31,12 +31,12 @@ FROM ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__first_value + ) AS ds__day__first_value , LAST_VALUE(ds) OVER ( PARTITION BY alien_day ORDER BY ds ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING - ) AS ds__alien_day__last_value + ) AS ds__day__last_value , ROW_NUMBER() OVER ( PARTITION BY alien_day ORDER BY ds @@ -47,8 +47,8 @@ FROM ( SELECT cte_6.ds__day AS ds__day , CASE - WHEN DATE_ADD('day', (cte_6.ds__day__row_number - 1), subq_25.ds__alien_day__first_value__lead) <= subq_25.ds__alien_day__last_value__lead - THEN DATE_ADD('day', (cte_6.ds__day__row_number - 1), subq_25.ds__alien_day__first_value__lead) + WHEN DATE_ADD('day', (cte_6.ds__day__row_number - 1), subq_25.ds__day__first_value__lead) <= subq_25.ds__day__last_value__lead + THEN DATE_ADD('day', (cte_6.ds__day__row_number - 1), subq_25.ds__day__first_value__lead) ELSE NULL END AS ds__day__lead FROM cte_6 cte_6 @@ -56,19 +56,19 @@ FROM ( -- Offset Custom Granularity Bounds SELECT ds__alien_day - , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead - , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead + , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead + , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead FROM ( -- Get Unique Rows for Custom Granularity Bounds SELECT ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value FROM cte_6 cte_6 GROUP BY ds__alien_day - , ds__alien_day__first_value - , ds__alien_day__last_value + , ds__day__first_value + , ds__day__last_value ) subq_24 ) subq_25 ON